1
0
mirror of https://github.com/samba-team/samba.git synced 2025-02-04 17:47:26 +03:00

only match vacuum list if on the same database

(This used to be ctdb commit 27e56955e93027534780cc7549ddb224670d82b6)
This commit is contained in:
Andrew Tridgell 2008-01-09 10:22:20 +11:00
parent fa77de5b34
commit 59d69bb709
2 changed files with 2 additions and 2 deletions

View File

@ -1631,7 +1631,7 @@ struct ctdb_db_context *ctdb_attach(struct ctdb_context *ctdb, const char *name,
return NULL; 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) { if (ctdb_db->ltdb == NULL) {
ctdb_set_error(ctdb, "Failed to open tdb '%s'\n", ctdb_db->db_path); ctdb_set_error(ctdb, "Failed to open tdb '%s'\n", ctdb_db->db_path);
talloc_free(ctdb_db); talloc_free(ctdb_db);

View File

@ -822,7 +822,7 @@ static void vacuum_fetch_handler(struct ctdb_context *ctdb, uint64_t srvid,
srcnode = r->reqid; srcnode = r->reqid;
for (v=rec->vacuum_info;v;v=v->next) { 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 */ /* we're already working on records from this node */
return; return;
} }