vacuum: revert "Do not delete VACUUM MIGRATED records immediately"

This reverts commit 257311e337065f089df688cbf261d2577949203d.

That commit was due to a misunderstanding, and it
does not fix what it was supposed to fix.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
(Imported from commit 1898200481f64676e596e52dc177c8d70ca1a00c)

diff --git a/server/ctdb_ltdb_server.c b/server/ctdb_ltdb_server.c
index 6a1185196001bb1e2340e4dcfb1f67480832b704..3b7191801a1ad8ec11f4639930c7c989b49ba128 100644 (file)
--- a/server/ctdb_ltdb_server.c
+++ b/server/ctdb_ltdb_server.c
@@ -115,11 +115,6 @@ static int ctdb_ltdb_store_server(struct ctdb_db_context *ctdb_db,
                 * fails. So storing the empty record makes sure that we do not
                 * need to change the client code.
                 */
-               if ((header->flags & CTDB_REC_FLAG_VACUUM_MIGRATED) &&
-                   (ctdb_db->ctdb->pnn == header->dmaster)) {
-                       keep = true;
-                       schedule_for_deletion = true;
-               }
                if (!(header->flags & CTDB_REC_FLAG_VACUUM_MIGRATED)) {
                        keep = true;
                } else if (ctdb_db->ctdb->pnn != header->dmaster) {