summaryrefslogtreecommitdiff
path: root/ctdb
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@gmail.com>2018-02-14 15:23:07 +1100
committerKarolin Seeger <kseeger@samba.org>2018-10-09 11:29:25 +0200
commit604c7b87e054a9870a12c1d804eec332b6c7b5ad (patch)
treec6d6d9778cee1f941325efdc4cdfcaf0c5bd56b4 /ctdb
parent00a263982cdf666c1c9c409e4f07df8f5d38ab98 (diff)
downloadsamba-604c7b87e054a9870a12c1d804eec332b6c7b5ad.tar.gz
ctdb-vacuum: Remove unnecessary check for zero records in delete list
Since no records are deleted from RB tree during step 1, there is no need for the check. Run step 2 unconditionally. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13641 Signed-off-by: Amitay Isaacs <amitay@gmail.com> Reviewed-by: Martin Schwenke <martin@meltin.net> (cherry picked from commit e15cdc652d76b37c58cd114215f00500991bc6b4)
Diffstat (limited to 'ctdb')
-rw-r--r--ctdb/server/ctdb_vacuum.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/ctdb/server/ctdb_vacuum.c b/ctdb/server/ctdb_vacuum.c
index 8faf803efb9..2194b7f4da7 100644
--- a/ctdb/server/ctdb_vacuum.c
+++ b/ctdb/server/ctdb_vacuum.c
@@ -854,10 +854,6 @@ static void ctdb_process_delete_list(struct ctdb_db_context *ctdb_db,
}
}
- if (vdata->count.delete_list.left == 0) {
- goto success;
- }
-
/*
* Step 2:
* Delete the remaining records locally.
@@ -873,8 +869,6 @@ static void ctdb_process_delete_list(struct ctdb_db_context *ctdb_db,
"delete list for deletion.\n"));
}
-success:
-
if (vdata->count.delete_list.left != 0) {
DEBUG(DEBUG_ERR, (__location__ " Vaccum db[%s] error: "
"there are %u records left for deletion after "