ctdb-protocol: Add srvid for messages during recovery

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>

diff --git a/ctdb/protocol/protocol.h b/ctdb/protocol/protocol.h
index e4bc3b9a0d4a0cd74fd69c3906af7034372d798b..25bf509d39ee97037dae4532ae41c9f5054cfcea 100644 (file)
--- a/ctdb/protocol/protocol.h
+++ b/ctdb/protocol/protocol.h
@@ -121,6 +121,9 @@ struct ctdb_call {
 /* SRVID prefix used by CTDB */
 #define CTDB_SRVID_PREFIX      0xF000000000000000LL
 
+/* SRVID prefix used during recovery for pulling and pushing databases */
+#define CTDB_SRVID_RECOVERY    0xF001000000000000LL
+
 /* SRVID to inform of election data */
 #define CTDB_SRVID_ELECTION    0xF100000000000000LL
 

diff --git a/ctdb/protocol/protocol_debug.c b/ctdb/protocol/protocol_debug.c
index d698b8293bb38f8888a533a96272f9e725173c62..889ebec377f00a3164a370f0511075820fbcafdb 100644 (file)
--- a/ctdb/protocol/protocol_debug.c
+++ b/ctdb/protocol/protocol_debug.c
@@ -279,6 +279,9 @@ static void ctdb_srvid_print(uint64_t srvid, FILE *fp)
 
        if (srvid == CTDB_SRVID_ALL) {
                fprintf(fp, "ALL");
+       } else if ((srvid & prefix) == CTDB_SRVID_RECOVERY) {
+               srvid = srvid & ~CTDB_SRVID_RECOVERY;
+               fprintf(fp, "RECOVERY-%"PRIx64"", srvid);
        } else if (srvid == CTDB_SRVID_ELECTION) {
                fprintf(fp, "ELECTION");
        } else if (srvid == CTDB_SRVID_RECONFIGURE) {