From 59d69bb70955e0d63d4fb47087c0f64f7bfbb39b Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 9 Jan 2008 10:22:20 +1100 Subject: [PATCH] only match vacuum list if on the same database (This used to be ctdb commit 27e56955e93027534780cc7549ddb224670d82b6) --- ctdb/client/ctdb_client.c | 2 +- ctdb/server/ctdb_recoverd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c index 7f897325c30..7cbfa6e4f09 100644 --- a/ctdb/client/ctdb_client.c +++ b/ctdb/client/ctdb_client.c @@ -1631,7 +1631,7 @@ struct ctdb_db_context *ctdb_attach(struct ctdb_context *ctdb, const char *name, return NULL; } - ctdb_db->ltdb = tdb_wrap_open(ctdb, ctdb_db->db_path, 0, 0, O_RDWR, 0); + ctdb_db->ltdb = tdb_wrap_open(ctdb, ctdb_db->db_path, 0, persistent?TDB_DEFAULT:TDB_NOSYNC, O_RDWR, 0); if (ctdb_db->ltdb == NULL) { ctdb_set_error(ctdb, "Failed to open tdb '%s'\n", ctdb_db->db_path); talloc_free(ctdb_db); diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index eeb6b77561b..474f42ced27 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -822,7 +822,7 @@ static void vacuum_fetch_handler(struct ctdb_context *ctdb, uint64_t srvid, srcnode = r->reqid; for (v=rec->vacuum_info;v;v=v->next) { - if (srcnode == v->srcnode) { + if (srcnode == v->srcnode && recs->db_id == v->ctdb_db->db_id) { /* we're already working on records from this node */ return; }