summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2015-06-12 10:59:54 +0200
committerStefan Metzmacher <metze@samba.org>2015-06-12 17:08:18 +0200
commit1898200481f64676e596e52dc177c8d70ca1a00c (patch)
tree98923efc69e60b5d2531ba7f13f2a1a61aa66283
parent53ff3e4f31f3debd98f9293171c023a0a406858d (diff)
downloadsamba-1898200481f64676e596e52dc177c8d70ca1a00c.tar.gz
ctdb-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>
-rw-r--r--ctdb/server/ctdb_ltdb_server.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/ctdb/server/ctdb_ltdb_server.c b/ctdb/server/ctdb_ltdb_server.c
index 8cf718098e5..c94e1d5c253 100644
--- a/ctdb/server/ctdb_ltdb_server.c
+++ b/ctdb/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) {