Rev 746: only match vacuum list if on the same database in http://samba.org/~tridge/ctdb

[tridge at samba.org]

------------------------------------------------------------
revno: 746
revision-id:tridge at samba.org-20080108232220-ym44ep4y456pg9hr
parent: tridge at samba.org-20080108215003-92psxyfonv27oukf
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge.stable
timestamp: Wed 2008-01-09 10:22:20 +1100
message:
  only match vacuum list if on the same database
modified:
  client/ctdb_client.c           ctdb_client.c-20070411010216-3kd8v37k61steeya-1
  server/ctdb_recoverd.c         recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1
=== modified file 'client/ctdb_client.c'
--- a/client/ctdb_client.c	2008-01-08 10:28:42 +0000
+++ b/client/ctdb_client.c	2008-01-08 23:22:20 +0000
@@ -1631,7 +1631,7 @@
 		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);

=== modified file 'server/ctdb_recoverd.c'
--- a/server/ctdb_recoverd.c	2008-01-08 10:28:42 +0000
+++ b/server/ctdb_recoverd.c	2008-01-08 23:22:20 +0000
@@ -822,7 +822,7 @@
 	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;
 		}