[SCM] CTDB repository - branch 1.2 updated - ctdb-1.9.1-408-gafdde23

[Ronnie Sahlberg]

The branch, 1.2 has been updated
       via  afdde23217250775f078f5d95912e76a3b2962eb (commit)
       via  13ccb717548ac0d5279e1c35bcedac4667bce1e2 (commit)
      from  811f4fa44a790f741699126a6bd88fd3dc23393a (commit)

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


- Log -----------------------------------------------------------------
commit afdde23217250775f078f5d95912e76a3b2962eb
Author: Ronnie Sahlberg <sahlberg at lenovo-laptop.(none)>
Date:   Tue Apr 5 10:32:02 2011 +1000

    Merge branches '1.2' and '1.2' of 10.1.1.27:/shared/ctdb/ctdb-master into 1.2

commit 13ccb717548ac0d5279e1c35bcedac4667bce1e2
Author: root <root at int001st001.VSOFS1.COM>
Date:   Tue Apr 5 09:20:10 2011 +1000

    ctdbd_pid : dont assign the ctdbd_pid until we have finished startup and thus dont log warnings about 'Handling event ...' until startup has finished.
    
    During startup there are some initial setup and commands done synchronous which means it is semi-normal to have the eventsystem blocked for some situations.
    
    Once startup has finished, all handling should be asynchronous so activate the monitoring of the eventsystems at that stage.
    
    CQ S1021936

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

Summary of changes:
 server/ctdb_daemon.c  |    7 +++----
 server/ctdb_monitor.c |    1 +
 2 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/server/ctdb_daemon.c b/server/ctdb_daemon.c
index 75344ad..f0c7ec9 100644
--- a/server/ctdb_daemon.c
+++ b/server/ctdb_daemon.c
@@ -50,7 +50,7 @@ static void ctdb_time_tick(struct event_context *ev, struct timed_event *te,
 {
 	struct ctdb_context *ctdb = talloc_get_type(private_data, struct ctdb_context);
 
-	if (getpid() != ctdbd_pid) {
+	if (getpid() != ctdb->ctdbd_pid) {
 		return;
 	}
 
@@ -776,11 +776,10 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork, bool use_syslog,
 	}
 	block_signal(SIGPIPE);
 
-	ctdbd_pid = getpid();
-	ctdb->ctdbd_pid = ctdbd_pid;
+	ctdb->ctdbd_pid = getpid();
 
 
-	DEBUG(DEBUG_ERR, ("Starting CTDBD as pid : %u\n", ctdbd_pid));
+	DEBUG(DEBUG_ERR, ("Starting CTDBD as pid : %u\n", ctdb->ctdbd_pid));
 
 	if (ctdb->do_setsched) {
 		/* try to set us up as realtime */
diff --git a/server/ctdb_monitor.c b/server/ctdb_monitor.c
index 820e082..89fa886 100644
--- a/server/ctdb_monitor.c
+++ b/server/ctdb_monitor.c
@@ -203,6 +203,7 @@ static void ctdb_startup_callback(struct ctdb_context *ctdb, int status, void *p
 	} else if (status == 0) {
 		DEBUG(DEBUG_NOTICE,("startup event OK - enabling monitoring\n"));
 		ctdb->done_startup = true;
+		ctdbd_pid = ctdb->ctdbd_pid;
 		ctdb->monitor->next_interval = 2;
 		ctdb_run_notification_script(ctdb, "startup");
 	}


-- 
CTDB repository