[SCM] CTDB repository - branch 1.0.112 updated - ctdb-1.0.111-30-g82172d6

[Ronnie Sahlberg]

The branch, 1.0.112 has been updated
       via  82172d6a8c6fe519baf064832281d1b24b9983fe (commit)
       via  ca3050593d5b52997c2d2940f18d53ffee027fde (commit)
      from  060c4a8eca64b8c90aec23ee67cf02a89da92033 (commit)

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


- Log -----------------------------------------------------------------
commit 82172d6a8c6fe519baf064832281d1b24b9983fe
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu Feb 11 11:32:22 2010 +1100

    Add a variable CTDB_CHECK_SWAP_IS_NOT_USED="yes"
    to control whether or not to check if we are swapping, and produce
    useful output into the logfile if we are.
    
    For production systems with dedicated nas-heads we should never swap.
    But for developer/test systems we often use smaller nondedicated systems where
    we can no longer guarantee that we will not be using swap.

commit ca3050593d5b52997c2d2940f18d53ffee027fde
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu Feb 11 11:19:08 2010 +1100

    lower the loglevel for a debug message for redundant releases of public ips

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

Summary of changes:
 config/events.d/00.ctdb |   12 +++++++-----
 server/ctdb_takeover.c  |    2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/00.ctdb b/config/events.d/00.ctdb
index a576ce4..9a9f3ef 100755
--- a/config/events.d/00.ctdb
+++ b/config/events.d/00.ctdb
@@ -30,11 +30,13 @@ case "$1" in
 
     monitor)
 	# We should never enter swap, so SwapTotal == SwapFree.
-	if [ -n "`grep '^Swap\(Total\|Free\)' /proc/meminfo | uniq -s 10 -u`" ]; then
-	    echo We are swapping:
-	    cat /proc/meminfo
-	    ps auxfww
-	fi
+	[ "$CTDB_CHECK_SWAP_IS_NOT_USED" = "yes" ] && {
+	    if [ -n "`grep '^Swap\(Total\|Free\)' /proc/meminfo | uniq -s 10 -u`" ]; then
+		echo We are swapping:
+		cat /proc/meminfo
+		ps auxfww
+	    fi
+	}
 
 	# monitor that we are not running out of memory
 	[ -z "$CTDB_MONITOR_FREE_MEMORY" ] || {
diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index 7357c0c..d685de8 100644
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -376,7 +376,7 @@ int32_t ctdb_control_release_ip(struct ctdb_context *ctdb,
 	vnn->takeover_ctx = NULL;
 
 	if (!ctdb_sys_have_ip(&pip->addr)) {
-		DEBUG(DEBUG_NOTICE,("Redundant release of IP %s/%u on interface %s (ip not held)\n", 
+		DEBUG(DEBUG_DEBUG,("Redundant release of IP %s/%u on interface %s (ip not held)\n", 
 			ctdb_addr_to_str(&pip->addr),
 			vnn->public_netmask_bits, 
 			vnn->iface));


-- 
CTDB repository