recoverd: Add debug message when dropping IPs in IP allocation

Update tests accordingly.

Signed-off-by: Martin Schwenke <martin@meltin.net>

diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index 44393a71ee2f49ebbcfeda75e9fa61e48e15f3c5..dfd626846028a7e72a8976abe8fbec3995785640 100644 (file)
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -2083,6 +2083,9 @@ static void unassign_unsuitable_ips(struct ctdb_context *ctdb,
                        continue;
                }
                if (nodemap->nodes[tmp_ip->pnn].flags & mask) {
+                       DEBUG(DEBUG_DEBUG,("Unassign IP: %s from %d\n",
+                                          ctdb_addr_to_str(&(tmp_ip->addr)),
+                                          tmp_ip->pnn));
                        tmp_ip->pnn = -1;
                }
        }
@@ -2096,6 +2099,9 @@ static void unassign_unsuitable_ips(struct ctdb_context *ctdb,
                }
                if (can_node_serve_ip(ctdb, tmp_ip->pnn, tmp_ip) != 0) {
                        /* this node can not serve this ip. */
+                       DEBUG(DEBUG_DEBUG,("Unassign IP: %s from %d\n",
+                                          ctdb_addr_to_str(&(tmp_ip->addr)),
+                                          tmp_ip->pnn));
                        tmp_ip->pnn = -1;
                }
        }

diff --git a/tests/takeover/det.001.sh b/tests/takeover/det.001.sh
index dec701037be05cd5424ea6e74b2ecf10eadf30d2..2387f12fb936812e16454089bcfd14fa28dbbb57 100755 (executable)
--- a/tests/takeover/det.001.sh
+++ b/tests/takeover/det.001.sh
@@ -6,6 +6,12 @@ define_test "3 nodes, 1 healthy"
 
 required_result <<EOF
 DATE TIME [PID]: Deterministic IPs enabled. Resetting all ip allocations
+DATE TIME [PID]: Unassign IP: 192.168.21.254 from 0
+DATE TIME [PID]: Unassign IP: 192.168.21.253 from 1
+DATE TIME [PID]: Unassign IP: 192.168.20.254 from 0
+DATE TIME [PID]: Unassign IP: 192.168.20.253 from 1
+DATE TIME [PID]: Unassign IP: 192.168.20.251 from 0
+DATE TIME [PID]: Unassign IP: 192.168.20.250 from 1
 192.168.21.254 2
 192.168.21.253 2
 192.168.21.252 2

diff --git a/tests/takeover/det.002.sh b/tests/takeover/det.002.sh
index 21c55bde72d31067596459a88f272394186d1d03..21fbaec316adeb5dfa1ee8b96c456c0fa25394db 100755 (executable)
--- a/tests/takeover/det.002.sh
+++ b/tests/takeover/det.002.sh
@@ -6,6 +6,9 @@ define_test "3 nodes, 2 healthy"
 
 required_result <<EOF
 DATE TIME [PID]: Deterministic IPs enabled. Resetting all ip allocations
+DATE TIME [PID]: Unassign IP: 192.168.21.253 from 1
+DATE TIME [PID]: Unassign IP: 192.168.20.253 from 1
+DATE TIME [PID]: Unassign IP: 192.168.20.250 from 1
 192.168.21.254 0
 192.168.21.253 0
 192.168.21.252 2

diff --git a/tests/takeover/nondet.001.sh b/tests/takeover/nondet.001.sh
index 71506070c09b64f05576780f1d5011e2c65e7a49..6f79c3460d2c73af5e691744aef08abca949136f 100755 (executable)
--- a/tests/takeover/nondet.001.sh
+++ b/tests/takeover/nondet.001.sh
@@ -5,6 +5,12 @@
 define_test "3 nodes, 1 healthy"
 
 required_result <<EOF
+DATE TIME [PID]: Unassign IP: 192.168.21.253 from 1
+DATE TIME [PID]: Unassign IP: 192.168.21.252 from 0
+DATE TIME [PID]: Unassign IP: 192.168.20.253 from 1
+DATE TIME [PID]: Unassign IP: 192.168.20.252 from 0
+DATE TIME [PID]: Unassign IP: 192.168.20.250 from 1
+DATE TIME [PID]: Unassign IP: 192.168.20.249 from 0
 192.168.21.254 2
 192.168.21.253 2
 192.168.21.252 2

diff --git a/tests/takeover/nondet.002.sh b/tests/takeover/nondet.002.sh
index 4ff801b1c4ed1af8cae624d400f2dea4d4dc9c24..c46f6a237cd1fcef0fb1282bc11060d272404dfa 100755 (executable)
--- a/tests/takeover/nondet.002.sh
+++ b/tests/takeover/nondet.002.sh
@@ -5,6 +5,9 @@
 define_test "3 nodes, 2 healthy"
 
 required_result <<EOF
+DATE TIME [PID]: Unassign IP: 192.168.21.253 from 1
+DATE TIME [PID]: Unassign IP: 192.168.20.253 from 1
+DATE TIME [PID]: Unassign IP: 192.168.20.250 from 1
 192.168.21.254 2
 192.168.21.253 0
 192.168.21.252 0

diff --git a/tests/takeover/scripts/local.sh b/tests/takeover/scripts/local.sh
index dc8c5e6dc8ed421179e5a167a2277695abba7098..66bb31c4a27b588c8ea3810d9b97db183d32bcbc 100644 (file)
--- a/tests/takeover/scripts/local.sh
+++ b/tests/takeover/scripts/local.sh
@@ -18,10 +18,7 @@ define_test ()
 simple_test ()
 {
     # Do some filtering of the output to replace date/time.
-    if [ \( "$CTDB_IP_ALGORITHM" = "lcp2" -a -n "$CTDB_TEST_LOGLEVEL" \) -o \
-       "$CTDB_IP_ALGORITHM" = "det" ] ; then
-       OUT_FILTER='s@^.*:@DATE\ TIME\ \[PID\]:@'
-    fi
+    OUT_FILTER='s@^[^\]]*\]:@DATE\ TIME\ \[PID\]:@'
 
     _states="$1"
     _out=$($VALGRIND $test_prog $_states 2>&1)