The branch, master has been updated
via 0535f73 ctdb:vacuum: move retrieval of freelist to after vacuum run
via bd47498 ctdb:vacuum: fix debug message typo in
add_record_to_delete_list()
from 4e05bad librpc/nbt: increase MAX_COMPONENTS limit for nbt_names.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0535f73c3abdcd77cb3f5e9f81641fa2a4e1764b
Author: Michael Adam <[email protected]>
Date: Mon Feb 10 02:44:56 2014 +0100
ctdb:vacuum: move retrieval of freelist to after vacuum run
The fast vacuum run may have increased the freelist size.
Signed-off-by: Michael Adam <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
Autobuild-User(master): Amitay Isaacs <[email protected]>
Autobuild-Date(master): Fri Feb 14 03:15:30 CET 2014 on sn-devel-104
commit bd474985b1db572cb08eff39b25ecae2b9d0dea8
Author: Michael Adam <[email protected]>
Date: Thu Feb 13 16:44:04 2014 +0100
ctdb:vacuum: fix debug message typo in add_record_to_delete_list()
Signed-off-by: Michael Adam <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
ctdb/server/ctdb_vacuum.c | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/server/ctdb_vacuum.c b/ctdb/server/ctdb_vacuum.c
index d07afd4..22603b8 100644
--- a/ctdb/server/ctdb_vacuum.c
+++ b/ctdb/server/ctdb_vacuum.c
@@ -147,7 +147,7 @@ static int add_record_to_delete_list(struct vacuum_data
*vdata, TDB_DATA key,
hash = ctdb_hash(&key);
if (trbt_lookup32(vdata->delete_list, hash)) {
- DEBUG(DEBUG_INFO, (__location__ " Hash collission when
vacuuming, skipping this record.\n"));
+ DEBUG(DEBUG_INFO, (__location__ " Hash collision when
vacuuming, skipping this record.\n"));
return 0;
}
@@ -1431,12 +1431,6 @@ static int ctdb_vacuum_and_repack_db(struct
ctdb_db_context *ctdb_db,
int freelist_size;
struct vacuum_data *vdata;
- freelist_size = tdb_freelist_size(ctdb_db->ltdb->tdb);
- if (freelist_size == -1) {
- DEBUG(DEBUG_ERR,(__location__ " Failed to get freelist size for
'%s'\n", name));
- return -1;
- }
-
vdata = talloc_zero(mem_ctx, struct vacuum_data);
if (vdata == NULL) {
DEBUG(DEBUG_ERR,(__location__ " Out of memory\n"));
@@ -1463,6 +1457,13 @@ static int ctdb_vacuum_and_repack_db(struct
ctdb_db_context *ctdb_db,
DEBUG(DEBUG_ERR,(__location__ " Failed to vacuum '%s'\n",
name));
}
+ freelist_size = tdb_freelist_size(ctdb_db->ltdb->tdb);
+ if (freelist_size == -1) {
+ DEBUG(DEBUG_ERR,(__location__ " Failed to get freelist size for
'%s'\n", name));
+ talloc_free(vdata);
+ return -1;
+ }
+
/*
* decide if a repack is necessary
*/
--
Samba Shared Repository
