[SCM] CTDB repository - branch master updated - ctdb-1.0.93-3-g687535b

[Ronnie Sahlberg]

The branch, master has been updated
       via  687535b51622d1fac7ccb38fa640bf1febd69fd8 (commit)
       via  5cb4d63bf6887d15aba37fafc3f6b6ba38027f13 (commit)
      from  f72d33ac73ebb1af802bacdfb30279df3cd8b8f9 (commit)

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


- Log -----------------------------------------------------------------
commit 687535b51622d1fac7ccb38fa640bf1febd69fd8
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Fri Oct 9 22:22:11 2009 +1100

    Fix bug spotted by Metze,
    
    the argument to ctdb_control_event_Script_disabled() is a string not a uint32

commit 5cb4d63bf6887d15aba37fafc3f6b6ba38027f13
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu Oct 8 19:17:57 2009 +1100

    version 1.0.94

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

Summary of changes:
 packaging/RPM/ctdb.spec |    4 +++-
 server/eventscript.c    |    6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index 2d97b85..8e68200 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -4,7 +4,7 @@ Summary: Clustered TDB
 Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name: ctdb
-Version: 1.0.93
+Version: 1.0.94
 Release: 1
 Epoch: 0
 License: GNU GPL version 3
@@ -132,6 +132,8 @@ fi
 %{_libdir}/pkgconfig/ctdb.pc
 
 %changelog
+* Thu Oct 10 2009 : Version 1.0.94
+ - Be very aggressive and quickly ban nodes that can not freeze their databases
 * Tue Oct 8 2009 : Version 1.0.93
  - When adding an ip, make sure to update this assignment on all nodes
    so it wont show up as -1 on other nodes.
diff --git a/server/eventscript.c b/server/eventscript.c
index b60b1e4..bbb4016 100644
--- a/server/eventscript.c
+++ b/server/eventscript.c
@@ -193,13 +193,13 @@ int32_t ctdb_control_event_script_stop(struct ctdb_context *ctdb, TDB_DATA indat
  */
 int32_t ctdb_control_event_script_disabled(struct ctdb_context *ctdb, TDB_DATA indata)
 {
-	int32_t res = *((int32_t *)indata.dptr);
+	const char *name = (const char *)indata.dptr;
 	struct ctdb_monitoring_status *monitoring_status =
 		talloc_get_type(ctdb->script_monitoring_ctx,
 			struct ctdb_monitoring_status);
 	struct ctdb_monitor_script_status *script;
 
-	DEBUG(DEBUG_INFO, ("event script disabed called : %d\n", (int)res));
+	DEBUG(DEBUG_INFO, ("event script disabed called for script %s\n", name));
 
 	if (monitoring_status == NULL) {
 		DEBUG(DEBUG_ERR,(__location__ " script_status is NULL when script finished.\n"));
@@ -213,7 +213,7 @@ int32_t ctdb_control_event_script_disabled(struct ctdb_context *ctdb, TDB_DATA i
 	}
 
 	script->finished = timeval_current();
-	script->status   = res;
+	script->status   = 0;
 	script->disabled = 1;
 
 	return 0;


-- 
CTDB repository