ctdb-daemon: Do not thaw databases if recovery is active

This prevents ctdb tool from thawing databases prematurely in
thaw/wipedb/restoredb commands if recovery is active.

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

diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index de7880bcc2725b77a7cc9da7f823e315c03617df..aeebed1b51679a271bb259d69e37bc2a57ff0420 100644 (file)
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -1059,7 +1059,8 @@ void ctdb_request_control_reply(struct ctdb_context *ctdb, struct ctdb_req_contr
                                TDB_DATA *outdata, int32_t status, const char *errormsg);
 
 int32_t ctdb_control_freeze(struct ctdb_context *ctdb, struct ctdb_req_control *c, bool *async_reply);
-int32_t ctdb_control_thaw(struct ctdb_context *ctdb, uint32_t priority);
+int32_t ctdb_control_thaw(struct ctdb_context *ctdb, uint32_t priority,
+                         bool check_recmode);
 
 int ctdb_start_recoverd(struct ctdb_context *ctdb);
 void ctdb_stop_recoverd(struct ctdb_context *ctdb);

diff --git a/ctdb/server/ctdb_control.c b/ctdb/server/ctdb_control.c
index 4c5a26ecaecdeea391da82854fcb94c49116ace0..1f9e4bc5a06bd5bae87353c0ebae35679ab71466 100644 (file)
--- a/ctdb/server/ctdb_control.c
+++ b/ctdb/server/ctdb_control.c
@@ -318,7 +318,7 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
 
        case CTDB_CONTROL_THAW:
                CHECK_CONTROL_DATA_SIZE(0);
-               return ctdb_control_thaw(ctdb, (uint32_t)c->srvid);
+               return ctdb_control_thaw(ctdb, (uint32_t)c->srvid, true);
 
        case CTDB_CONTROL_SET_RECMODE:
                CHECK_CONTROL_DATA_SIZE(sizeof(uint32_t));              

diff --git a/ctdb/server/ctdb_freeze.c b/ctdb/server/ctdb_freeze.c
index fee44d4646c0968ee2f2dd319b77aa735d68f59b..42a12850ac3bea7bca8541d99cb6dff5d44b71ba 100644 (file)
--- a/ctdb/server/ctdb_freeze.c
+++ b/ctdb/server/ctdb_freeze.c
@@ -267,11 +267,18 @@ static void thaw_priority(struct ctdb_context *ctdb, uint32_t priority)
 /*
   thaw the databases
  */
-int32_t ctdb_control_thaw(struct ctdb_context *ctdb, uint32_t priority)
+int32_t ctdb_control_thaw(struct ctdb_context *ctdb, uint32_t priority,
+                         bool check_recmode)
 {
-
        if (priority > NUM_DB_PRIORITIES) {
-               DEBUG(DEBUG_ERR,(__location__ " Invalid db priority : %u\n", priority));
+               DEBUG(DEBUG_ERR,(__location__ " Invalid db priority : %u\n",
+                                priority));
+               return -1;
+       }
+
+       if (check_recmode && ctdb->recovery_mode == CTDB_RECOVERY_ACTIVE) {
+               DEBUG(DEBUG_ERR, ("Failing to thaw databases while "
+                                 "recovery is active\n"));
                return -1;
        }
 

diff --git a/ctdb/server/ctdb_recover.c b/ctdb/server/ctdb_recover.c
index 7249f50ff4cdaf42eb6847e4f8554ee9765a9220..aa6abbeaaadb811afb6172483d8a0908f742335c 100644 (file)
--- a/ctdb/server/ctdb_recover.c
+++ b/ctdb/server/ctdb_recover.c
@@ -623,7 +623,7 @@ int32_t ctdb_control_set_recmode(struct ctdb_context *ctdb,
        /* force the databases to thaw */
        for (i=1; i<=NUM_DB_PRIORITIES; i++) {
                if (ctdb->freeze_handles[i] != NULL) {
-                       ctdb_control_thaw(ctdb, i);
+                       ctdb_control_thaw(ctdb, i, false);
                }
        }