ReadOnly: clear out the tracking record once a revoke is completed

diff --git a/server/ctdb_call.c b/server/ctdb_call.c
index 2df86b46c9474a3060e2ff1fdce9492c17ea51fd..fbce276df35924992550289f8f8dea905e02e159 100644 (file)
--- a/server/ctdb_call.c
+++ b/server/ctdb_call.c
@@ -516,6 +516,10 @@ void ctdb_request_call(struct ctdb_context *ctdb, struct ctdb_req_header *hdr)
                if (ctdb_ltdb_store(ctdb_db, call->key, &header, data) != 0) {
                        ctdb_fatal(ctdb, "Failed to write header with cleared REVOKE flag");
                }
+               /* and clear out the tracking data */
+               if (tdb_delete(ctdb_db->rottdb, call->key) != 0) {
+                       DEBUG(DEBUG_ERR,(__location__ " Failed to clear out trackingdb record\n"));
+               }
        }
 
        /* if we are revoking, we must defer all other calls until the revoke

diff --git a/server/ctdb_daemon.c b/server/ctdb_daemon.c
index 2a5db64bf421cbac2c63e55436a2f5142f3f67bd..742170a690c895ed98cc9ec749ed1fefae149617 100644 (file)
--- a/server/ctdb_daemon.c
+++ b/server/ctdb_daemon.c
@@ -434,6 +434,10 @@ static void daemon_request_call_from_client(struct ctdb_client *client,
                if (ctdb_ltdb_store(ctdb_db, key, &header, data) != 0) {
                        ctdb_fatal(ctdb, "Failed to write header with cleared REVOKE flag");
                }
+               /* and clear out the tracking data */
+               if (tdb_delete(ctdb_db->rottdb, key) != 0) {
+                       DEBUG(DEBUG_ERR,(__location__ " Failed to clear out trackingdb record\n"));
+               }
        }
 
        /* if we are revoking, we must defer all other calls until the revoke