- fixed flags display in logs

- added monitor handler to test event script

(This used to be ctdb commit a4c18dddee169df49e5d77d9a94ce9329f169319)

diff --git a/ctdb/common/ctdb_recoverd.c b/ctdb/common/ctdb_recoverd.c
index 20dc349bc5bda69184836049919c71940b5980f0..9adbe5fbcf67ad747938e88f308f0d7d4000983a 100644 (file)
--- a/ctdb/common/ctdb_recoverd.c
+++ b/ctdb/common/ctdb_recoverd.c
@@ -991,8 +991,7 @@ static void monitor_handler(struct ctdb_context *ctdb, uint64_t srvid,
                return;
        }
 
-       DEBUG(0,("Node %u has changed flags - was 0x%x now 0x%x\n", 
-                c->vnn, nodemap->nodes[i].flags, c->flags));
+       DEBUG(0,("Node %u has changed flags - now 0x%x\n", c->vnn, c->flags));
 
        nodemap->nodes[i].flags = c->flags;
        

diff --git a/ctdb/tests/events b/ctdb/tests/events
index 00b0e49a21230541f1a00ea87ecc88de0d9f8292..70df49a34e16586e6bd543744f550fb4eee99c05 100755 (executable)
--- a/ctdb/tests/events
+++ b/ctdb/tests/events
@@ -5,6 +5,10 @@ cmd="$1"
 shift
 
 case $cmd in 
+    monitor)
+       echo "`date` monitor event"
+       exit 0
+       ;;
      startup)
        echo "`date` ctdb startup event"
        exit 0;