[SCM] CTDB repository - branch 1.2.40 updated - ctdb-1.2.65-2-g9321cc2

[Amitay Isaacs]

The branch, 1.2.40 has been updated
       via  9321cc2b24c351bca92bf728046cafa3073ef89a (commit)
       via  d973a575eb619c0cad139ae9c22d7d1770dc3666 (commit)
      from  dc84c8ed12ed1bf136827b55128c2e74b38bdf55 (commit)

http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=1.2.40


- Log -----------------------------------------------------------------
commit 9321cc2b24c351bca92bf728046cafa3073ef89a
Author: Martin Schwenke <martin at meltin.net>
Date:   Thu Jul 18 13:33:04 2013 +1000

    New version 1.2.66
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>

commit d973a575eb619c0cad139ae9c22d7d1770dc3666
Author: Martin Schwenke <martin at meltin.net>
Date:   Tue Jul 16 19:31:05 2013 +1000

    eventscripts: A missing interface should cause monitoring to fail
    
    A missing interface is at least as bad as an interface with a link
    that is down so should have a similar effect.
    
    This couldn't be done previously because orphaned interfaces used to
    be listed for monitoring.  This was worked around in 10.interface in
    commit a5b8e2c1ec1b4fd7ef25e70a919ef4c70f3e1c75.
    
    If $CTDB_PARTIALLY_ONLINE_INTERFACES="yes" then monitoring won't
    actually fail but the interface is still marked as down.
    
    This effectively reverts d40330453854d81d182112b49f5f6f2e0814b231 and
    89547a1910fd74f98ae9d5737914328eb5cc3eaf.  However, it heeds the
    warning in the commit message for latter by avoiding an early exit.
    it just flags a failure and marks the interfaces as down in ctdbd.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>

-----------------------------------------------------------------------

Summary of changes:
 config/events.d/10.interface |    3 +++
 packaging/RPM/ctdb.spec.in   |    4 +++-
 2 files changed, 6 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/10.interface b/config/events.d/10.interface
index d407154..ce648a1 100755
--- a/config/events.d/10.interface
+++ b/config/events.d/10.interface
@@ -38,6 +38,9 @@ monitor_interfaces()
 	for IFACE in $INTERFACES ; do
 
 	    ip addr show $IFACE 2>/dev/null >/dev/null || {
+		echo "ERROR: Interface $IFACE does not exist but is used by public addresses"
+		fail=1
+		ctdb setifacelink $IFACE down >/dev/null 2>/dev/null
 		continue
 	    }
 
diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index 5084d2a..8f74e3e 100644
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -3,7 +3,7 @@ Name: ctdb
 Summary: Clustered TDB
 Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
-Version: 1.2.65
+Version: 1.2.66
 Release: 1GITHASH
 Epoch: 0
 License: GNU GPL version 3
@@ -155,6 +155,8 @@ development libraries for ctdb
 
 %changelog
 
+* Thu Jul 18 2013 : Version 1.2.66
+  - A missing interface should cause monitoring to fail
 * Tue Jul 02 2013 : Version 1.2.65
   - Fix the flags passed in modify flags control from recovery daemon
   - Do early return from recoverd main loop if node is inactive


-- 
CTDB repository