[SCM] CTDB repository - branch master updated - ctdb-1.13-214-gb3e798f

[Amitay Isaacs]

The branch, master has been updated
       via  b3e798f357606648f04d8a67ffee775b34fdede7 (commit)
       via  538c68d0e83e14f0000981ee06408b8f0035be37 (commit)
       via  3de2830ae68241ee95bcc14dc1bb896ff18d86ce (commit)
       via  25f84797a64a683c303b04057aa8113e9fc47c49 (commit)
      from  d29e1880c8ce7219e065d31b47b0e8ad9e83146d (commit)

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


- Log -----------------------------------------------------------------
commit b3e798f357606648f04d8a67ffee775b34fdede7
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Tue Jul 24 17:27:22 2012 +1000

    web: Add my name to the developer list.
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>

commit 538c68d0e83e14f0000981ee06408b8f0035be37
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Fri Jun 15 11:05:00 2012 +1000

    Remove tevent_loop_allow_nesting()
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>

commit 3de2830ae68241ee95bcc14dc1bb896ff18d86ce
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Wed Jun 6 16:19:10 2012 +1000

    ctdbd: Return explicit boolean values for function returning bool
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>

commit 25f84797a64a683c303b04057aa8113e9fc47c49
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Wed Jun 6 16:16:15 2012 +1000

    util: Do not try to lockdown memory when running in local daemons mode
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>

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

Summary of changes:
 common/ctdb_util.c    |    7 ++++++-
 server/ctdb_daemon.c  |    2 +-
 server/ctdb_freeze.c  |    2 +-
 server/ctdb_logging.c |    1 -
 tools/ctdb.c          |    1 -
 web/index.html        |    1 +
 6 files changed, 9 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/common/ctdb_util.c b/common/ctdb_util.c
index b9af95b..30effdd 100644
--- a/common/ctdb_util.c
+++ b/common/ctdb_util.c
@@ -642,10 +642,15 @@ void ctdb_lockdown_memory(struct ctdb_context *ctdb)
 		return;
 	}
 
+	/* Ignore when running in local daemons mode */
+	if (getpid() != 0) {
+		return;
+	}
+
 	/* Avoid compiler optimizing out dummy. */
 	mlock(dummy, sizeof(dummy));
 	if (mlockall(MCL_CURRENT) != 0) {
-		DEBUG(DEBUG_WARNING,("Failed to lock memory: %s'\n",
+		DEBUG(DEBUG_WARNING,("Failed to lockdown memory: %s'\n",
 				     strerror(errno)));
 	}
 #endif
diff --git a/server/ctdb_daemon.c b/server/ctdb_daemon.c
index e403c08..13ea319 100644
--- a/server/ctdb_daemon.c
+++ b/server/ctdb_daemon.c
@@ -1214,7 +1214,7 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork, bool use_syslog,
 	ctdb_run_notification_script(ctdb, "init");
 
 	/* start frozen, then let the first election sort things out */
-	if (ctdb_blocking_freeze(ctdb)) {
+	if (!ctdb_blocking_freeze(ctdb)) {
 		ctdb_fatal(ctdb, "Failed to get initial freeze\n");
 	}
 
diff --git a/server/ctdb_freeze.c b/server/ctdb_freeze.c
index c8941f2..7d17899 100644
--- a/server/ctdb_freeze.c
+++ b/server/ctdb_freeze.c
@@ -359,7 +359,7 @@ bool ctdb_blocking_freeze(struct ctdb_context *ctdb)
 		}
 	}
 
-	return 0;
+	return true;
 }
 
 
diff --git a/server/ctdb_logging.c b/server/ctdb_logging.c
index 7133d06..9455ff1 100644
--- a/server/ctdb_logging.c
+++ b/server/ctdb_logging.c
@@ -118,7 +118,6 @@ int start_syslog_daemon(struct ctdb_context *ctdb)
 	debug_extra = talloc_asprintf(NULL, "syslogd:");
 	talloc_free(ctdb->ev);
 	ctdb->ev = event_context_init(NULL);
-	tevent_loop_allow_nesting(ctdb->ev);
 
 	syslog(LOG_ERR, "Starting SYSLOG daemon with pid:%d", (int)getpid());
 
diff --git a/tools/ctdb.c b/tools/ctdb.c
index 8e960a1..d034591 100644
--- a/tools/ctdb.c
+++ b/tools/ctdb.c
@@ -5927,7 +5927,6 @@ int main(int argc, const char *argv[])
 		DEBUG(DEBUG_ERR, ("Failed to initialize event system\n"));
 		exit(1);
 	}
-	tevent_loop_allow_nesting(ev);
 
 	for (i=0;i<ARRAY_SIZE(ctdb_commands);i++) {
 		if (strcmp(control, ctdb_commands[i].name) == 0) {
diff --git a/web/index.html b/web/index.html
index d9d03a2..91f87e8 100644
--- a/web/index.html
+++ b/web/index.html
@@ -135,6 +135,7 @@ projects that want to make their services cluster aware using CTDB.
 <li><a href="http://sernet.de/Samba/">Volker Lendecke</a></li>
 <li>Stefan Metzmacher</li>
 <li><a href="http://meltin.net/people/martin/">Martin Schwenke</a></li>
+<li>Amitay Isaacs</li>
 </ul>
 
 <!--#include virtual="footer.html" -->


-- 
CTDB repository