[SCM] CTDB repository - branch master updated - ctdb-1.10-173-g89f8169

[Michael Adam]

The branch, master has been updated
       via  89f8169c24da96c1fdd0ac19b8a1e0e1df01a72a (commit)
       via  ad709e99bcad7a4884f2336663d161ba61307ae5 (commit)
       via  e02bbd915b7151c615ff64f09ad9abc9720bef7d (commit)
      from  a16dc65b4602da5ce2c16578bec2e7882aff240d (commit)

http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 89f8169c24da96c1fdd0ac19b8a1e0e1df01a72a
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Mon Mar 14 09:55:28 2011 +1100

    IP reallocation. If a public address is already hosted on the node when we startup, log a warning message but do not cause the recovery to fail.
    
    CQ S1022356
    
    Signed-off-by: Michael Adam <obnox at samba.org>

commit ad709e99bcad7a4884f2336663d161ba61307ae5
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Sun Mar 13 11:30:52 2011 +1100

    Vacuuming: initialize a variable to avoid a harmless valgrind hit
    
    Signed-off-by: Michael Adam <obnox at samba.org>

commit e02bbd915b7151c615ff64f09ad9abc9720bef7d
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Sat Mar 12 09:42:07 2011 +1100

    Dont allow clients to connect to databases untile we are well past and through
    the initial recovery phase
    
    CQ S1022412
    
    Signed-off-by: Michael Adam <obnox at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 server/ctdb_ltdb_server.c |    3 ++-
 server/ctdb_monitor.c     |    1 +
 server/ctdb_takeover.c    |    2 +-
 server/ctdb_vacuum.c      |    3 ++-
 4 files changed, 6 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/server/ctdb_ltdb_server.c b/server/ctdb_ltdb_server.c
index 92fb0f6..fe061e7 100644
--- a/server/ctdb_ltdb_server.c
+++ b/server/ctdb_ltdb_server.c
@@ -1029,7 +1029,8 @@ int32_t ctdb_control_db_attach(struct ctdb_context *ctdb, TDB_DATA indata,
 		}
 
 		if (ctdb->recovery_mode == CTDB_RECOVERY_ACTIVE
-		 && client->pid != ctdb->recoverd_pid) {
+		 && client->pid != ctdb->recoverd_pid
+		 && !ctdb->done_startup) {
 			struct ctdb_deferred_attach_context *da_ctx = talloc(client, struct ctdb_deferred_attach_context);
 
 			if (da_ctx == NULL) {
diff --git a/server/ctdb_monitor.c b/server/ctdb_monitor.c
index 02f7149..547dcc0 100644
--- a/server/ctdb_monitor.c
+++ b/server/ctdb_monitor.c
@@ -302,6 +302,7 @@ static void ctdb_wait_until_recovered(struct event_context *ev, struct timed_eve
 			   "ctdb_start_monitoring: ctdb_recheck_persistent_health() OK\n"));
 
 	DEBUG(DEBUG_NOTICE,(__location__ " Recoveries finished. Running the \"startup\" event.\n"));
+	DEBUG(DEBUG_ERR,(__location__ " Allow clients to attach to databases.\n"));
 	event_add_timed(ctdb->ev, ctdb->monitor->monitor_context,
 			     timeval_current(),
 			     ctdb_check_health, ctdb);
diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index 1d6fe6e..3dac1f7 100644
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -596,7 +596,7 @@ int32_t ctdb_control_takeover_ip(struct ctdb_context *ctdb,
 		DEBUG(DEBUG_CRIT,(__location__ " takeoverip of IP %s is known to the kernel, "
 				  "but we have no interface assigned, has someone manually configured it? Ignore for now.\n",
 				 ctdb_addr_to_str(&vnn->public_address)));
-		return -1;
+		return 0;
 	}
 
 	if (vnn->pnn != ctdb->pnn && have_ip && vnn->pnn != -1) {
diff --git a/server/ctdb_vacuum.c b/server/ctdb_vacuum.c
index 5bd2b0a..bdb7c40 100644
--- a/server/ctdb_vacuum.c
+++ b/server/ctdb_vacuum.c
@@ -1261,7 +1261,8 @@ int ctdb_vacuum_init(struct ctdb_db_context *ctdb_db)
 	ctdb_db->vacuum_handle = talloc(ctdb_db, struct ctdb_vacuum_handle);
 	CTDB_NO_MEMORY(ctdb_db->ctdb, ctdb_db->vacuum_handle);
 
-	ctdb_db->vacuum_handle->ctdb_db = ctdb_db;
+	ctdb_db->vacuum_handle->ctdb_db         = ctdb_db;
+	ctdb_db->vacuum_handle->fast_path_count = 0;
 
 	event_add_timed(ctdb_db->ctdb->ev, ctdb_db->vacuum_handle, 
 			timeval_current_ofs(get_vacuum_interval(ctdb_db), 0), 


-- 
CTDB repository