ctdb-vacuum: revert "Do not delete VACUUM MIGRATED records immediately"
authorMichael Adam <obnox@samba.org>
Fri, 12 Jun 2015 08:59:54 +0000 (10:59 +0200)
committerStefan Metzmacher <metze@samba.org>
Fri, 12 Jun 2015 15:08:18 +0000 (17:08 +0200)
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>
ctdb/server/ctdb_ltdb_server.c

index 8cf718098e5cb451366d9fa2d2183facc6c5b16d..c94e1d5c253337f618a348c32469cbcdaba535b5 100644 (file)
@@ -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) {