diff options
| author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2010-08-19 13:16:35 +1000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2010-08-19 13:16:35 +1000 |
| commit | 4c05f1900c24ea15bb816dc62feb3a291c008c55 (patch) | |
| tree | 30e2e0558e07e3ef16402355455cb225bcb35908 /ctdb/server/ctdb_freeze.c | |
| parent | 729f1ddea065040fa10bed035b3f731db4beae81 (diff) | |
| parent | 5f2d43157dd6c76d903be0dc16b1138c70511e8d (diff) | |
| download | samba-4c05f1900c24ea15bb816dc62feb3a291c008c55.tar.gz samba-4c05f1900c24ea15bb816dc62feb3a291c008c55.tar.xz samba-4c05f1900c24ea15bb816dc62feb3a291c008c55.zip | |
Merge commit 'rusty/vacuum-fix-master'
(This used to be ctdb commit dc301b324d2c14a2425a965c076113c4fe97903e)
Diffstat (limited to 'ctdb/server/ctdb_freeze.c')
| -rw-r--r-- | ctdb/server/ctdb_freeze.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ctdb/server/ctdb_freeze.c b/ctdb/server/ctdb_freeze.c index 924a7131e85..d2857a90c8e 100644 --- a/ctdb/server/ctdb_freeze.c +++ b/ctdb/server/ctdb_freeze.c @@ -273,6 +273,9 @@ int ctdb_start_freeze(struct ctdb_context *ctdb, uint32_t priority) return 0; } + /* Stop any vacuuming going on: we don't want to wait. */ + ctdb_stop_vacuuming(ctdb); + /* if there isn't a freeze lock child then create one */ if (ctdb->freeze_handles[priority] == NULL) { ctdb->freeze_handles[priority] = ctdb_freeze_lock(ctdb, priority); |