summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2013-05-14 16:20:32 +1000
committerAmitay Isaacs <amitay@gmail.com>2013-05-23 16:17:18 +1000
commit5aeae9744e1bb8c8e715b7c3e052d839d0d09ca5 (patch)
tree69ac36017f4f37d1bf5a73419895cbfd41fc8ffb
parente769f8575a845abf5aaba43bac2745f8fc320275 (diff)
downloadsamba-5aeae9744e1bb8c8e715b7c3e052d839d0d09ca5.tar.gz
samba-5aeae9744e1bb8c8e715b7c3e052d839d0d09ca5.tar.xz
samba-5aeae9744e1bb8c8e715b7c3e052d839d0d09ca5.zip
ctdbd: Log a message when recovery master changes
Signed-off-by: Martin Schwenke <martin@meltin.net> Pair-Programmed-With: Amitay Isaacs <amitay@gmail.com> (This used to be ctdb commit 1f96ea08f9a39dfe537c9b957ac512c84dc76f91)
-rw-r--r--ctdb/server/ctdb_recover.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/ctdb/server/ctdb_recover.c b/ctdb/server/ctdb_recover.c
index 2e9408fc9e..7fd0ac36ea 100644
--- a/ctdb/server/ctdb_recover.c
+++ b/ctdb/server/ctdb_recover.c
@@ -1350,9 +1350,22 @@ int32_t ctdb_control_recd_ping(struct ctdb_context *ctdb)
int32_t ctdb_control_set_recmaster(struct ctdb_context *ctdb, uint32_t opcode, TDB_DATA indata)
{
+ uint32_t new_recmaster;
+
CHECK_CONTROL_DATA_SIZE(sizeof(uint32_t));
+ new_recmaster = ((uint32_t *)(&indata.dptr[0]))[0];
+
+ if (ctdb->pnn != new_recmaster && ctdb->recovery_master == ctdb->pnn) {
+ DEBUG(DEBUG_NOTICE,
+ ("This node (%u) is no longer the recovery master\n", ctdb->pnn));
+ }
+
+ if (ctdb->pnn == new_recmaster && ctdb->recovery_master != new_recmaster) {
+ DEBUG(DEBUG_NOTICE,
+ ("This node (%u) is now the recovery master\n", ctdb->pnn));
+ }
- ctdb->recovery_master = ((uint32_t *)(&indata.dptr[0]))[0];
+ ctdb->recovery_master = new_recmaster;
return 0;
}