Revert "TODO testing ctdb_ltdb_store_server: when storing a record that is not to...

This reverts commit 3ef7a9f0d03e8373f790f0065f922b8c610248a2.

diff --git a/server/ctdb_ltdb_server.c b/server/ctdb_ltdb_server.c
index e90f8909503b67e74eac2636c6d556e068079af3..f7eee7576d30da0b06864af2d918823f0c331d75 100644 (file)
--- a/server/ctdb_ltdb_server.c
+++ b/server/ctdb_ltdb_server.c
@@ -69,7 +69,6 @@ static int ctdb_ltdb_store_server(struct ctdb_db_context *ctdb_db,
        bool seqnum_suppressed = false;
        bool keep = false;
        bool schedule_for_deletion = false;
-       bool remove_from_delete_queue = false;
        uint32_t lmaster;
 
        if (ctdb->flags & CTDB_FLAG_TORTURE) {
@@ -141,14 +140,12 @@ static int ctdb_ltdb_store_server(struct ctdb_db_context *ctdb_db,
                keep = true;
        }
 
-       if (keep) {
-               if ((data.dsize == 0) &&
-                   !ctdb_db->persistent &&
-                   (ctdb_db->ctdb->pnn == header->dmaster))
-               {
-                       schedule_for_deletion = true;
-               }
-               remove_from_delete_queue = !schedule_for_deletion;
+       if (keep &&
+           (data.dsize == 0) &&
+           !ctdb_db->persistent &&
+           (ctdb_db->ctdb->pnn == header->dmaster))
+       {
+               schedule_for_deletion = true;
        }
 
 store:
@@ -213,7 +210,6 @@ store:
                ret = tdb_delete(ctdb_db->ltdb->tdb, key);
        }
 
-
        if (ret != 0) {
                int lvl = DEBUG_ERR;
 
@@ -230,7 +226,6 @@ store:
                            tdb_errorstr(ctdb_db->ltdb->tdb)));
 
                schedule_for_deletion = false;
-               remove_from_delete_queue = false;
        }
        if (seqnum_suppressed) {
                tdb_add_flags(ctdb_db->ltdb->tdb, TDB_SEQNUM);
@@ -246,10 +241,6 @@ store:
                }
        }
 
-       if (remove_from_delete_queue) {
-               ctdb_local_remove_from_delete_queue(ctdb_db, header, key);
-       }
-
        return ret;
 }