[SCM] CTDB repository - branch master updated - 8140825e1d06053a900fd0adf0a150622c0fc146

Ronnie Sahlberg sahlberg at samba.org
Wed Jul 16 23:09:44 GMT 2008


The branch, master has been updated
       via  8140825e1d06053a900fd0adf0a150622c0fc146 (commit)
      from  d7e9c0010a40f9335d28cf108e8f5cf411970a03 (commit)

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


- Log -----------------------------------------------------------------
commit 8140825e1d06053a900fd0adf0a150622c0fc146
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu Jul 17 09:04:15 2008 +1000

    Do not allow "ctdb eventscript" to start new eventscripts while we are in recovery mode

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

Summary of changes:
 server/eventscript.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/server/eventscript.c b/server/eventscript.c
index 3168122..057bc80 100644
--- a/server/eventscript.c
+++ b/server/eventscript.c
@@ -489,6 +489,11 @@ int32_t ctdb_run_eventscripts(struct ctdb_context *ctdb,
 
 	DEBUG(DEBUG_NOTICE,("Forced running of eventscripts with arguments %s\n", indata.dptr));
 
+	if (ctdb->recovery_mode != CTDB_RECOVERY_NORMAL) {
+		DEBUG(DEBUG_ERR, (__location__ " Aborted running eventscript \"%s\" while in RECOVERY mode\n", indata.dptr));
+		return -1;
+	}
+
 	ctdb_disable_monitoring(ctdb);
 
 	ret = ctdb_event_script_callback(ctdb, 


-- 
CTDB repository


More information about the samba-cvs mailing list