sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

ctdb-vacuum: treat value 0 of tunable RepackLimit as turned off.

Browse Source 
I.e. when RepackLimit is set to 0, no size of the freelist
should trigger a repack in vacuuming.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Michael Adam 2014-02-12 17:40:31 +01:00 committed by Amitay Isaacs
parent af5568b267
commit 48f2d11588
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ctdb/server/ctdb_vacuum.c
View File

@ -1420,7 +1420,7 @@ static int ctdb_vacuum_and_repack_db(struct ctdb_db_context *ctdb_db,
uint32_t repack_limit = ctdb_db->ctdb->tunable.repack_limit; uint32_t repack_limit = ctdb_db->ctdb->tunable.repack_limit;
uint32_t vacuum_limit = ctdb_db->ctdb->tunable.vacuum_limit; uint32_t vacuum_limit = ctdb_db->ctdb->tunable.vacuum_limit;
const char *name = ctdb_db->db_name; const char *name = ctdb_db->db_name;
int freelist_size; int freelist_size = 0;
struct vacuum_data *vdata; struct vacuum_data *vdata;
vdata = talloc_zero(mem_ctx, struct vacuum_data); vdata = talloc_zero(mem_ctx, struct vacuum_data);
@ -1449,17 +1449,19 @@ static int ctdb_vacuum_and_repack_db(struct ctdb_db_context *ctdb_db,
DEBUG(DEBUG_ERR,(__location__ " Failed to vacuum '%s'\n", name)); DEBUG(DEBUG_ERR,(__location__ " Failed to vacuum '%s'\n", name));
} }
freelist_size = tdb_freelist_size(ctdb_db->ltdb->tdb); if (repack_limit != 0) {
if (freelist_size == -1) { freelist_size = tdb_freelist_size(ctdb_db->ltdb->tdb);
DEBUG(DEBUG_ERR,(__location__ " Failed to get freelist size for '%s'\n", name)); if (freelist_size == -1) {
talloc_free(vdata); DEBUG(DEBUG_ERR,(__location__ " Failed to get freelist size for '%s'\n", name));
return -1; talloc_free(vdata);
return -1;
}
} }
/* /*
* decide if a repack is necessary * decide if a repack is necessary
*/ */
if ((uint32_t)freelist_size < repack_limit && if ((repack_limit == 0 || (uint32_t)freelist_size < repack_limit) &&
vdata->delete_left < vacuum_limit) vdata->delete_left < vacuum_limit)
{ {
talloc_free(vdata); talloc_free(vdata);