Rev 108: merge CTDB_SRVID_ALL patch from Samba4 in
http://samba.org/~tridge/ctdb
tridge at samba.org
tridge at samba.org
Mon Apr 16 00:31:39 GMT 2007
------------------------------------------------------------
revno: 108
revision-id: tridge at samba.org-20070416003139-ac731d5336e759e3
parent: tridge at samba.org-20070416002144-34daa28d0f1d01db
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Mon 2007-04-16 10:31:39 +1000
message:
merge CTDB_SRVID_ALL patch from Samba4
modified:
common/ctdb_message.c ctdb_message.c-20070208224107-9dnio7x7z33prrmt-1
common/ctdb_util.c ctdb_util.c-20061128065342-to93h6eejj5kon81-3
include/ctdb.h ctdb.h-20061117234101-o3qt14umlg9en8z0-11
=== modified file 'common/ctdb_message.c'
--- a/common/ctdb_message.c 2007-04-16 00:21:44 +0000
+++ b/common/ctdb_message.c 2007-04-16 00:31:39 +0000
@@ -39,7 +39,7 @@
/* XXX we need a must faster way of finding the matching srvid
- maybe a tree? */
for (ml=ctdb->message_list;ml;ml=ml->next) {
- if (ml->srvid == srvid) break;
+ if (ml->srvid == srvid || ml->srvid == CTDB_SRVID_ALL) break;
}
if (ml == NULL) {
printf("daemon vnn:%d no msg handler for srvid=%u\n", ctdb_get_vnn(ctdb), srvid);
=== modified file 'common/ctdb_util.c'
--- a/common/ctdb_util.c 2007-04-16 00:21:44 +0000
+++ b/common/ctdb_util.c 2007-04-16 00:31:39 +0000
@@ -43,15 +43,16 @@
talloc_free(ctdb->err_msg);
va_start(ap, fmt);
ctdb->err_msg = talloc_vasprintf(ctdb, fmt, ap);
+ DEBUG(0,("ctdb error: %s\n", ctdb->err_msg));
va_end(ap);
}
-
/*
a fatal internal error occurred - no hope for recovery
*/
void ctdb_fatal(struct ctdb_context *ctdb, const char *msg)
{
+ DEBUG(0,("ctdb fatal error: %s\n", msg));
fprintf(stderr, "ctdb fatal error: '%s'\n", msg);
abort();
}
=== modified file 'include/ctdb.h'
--- a/include/ctdb.h 2007-04-12 05:46:50 +0000
+++ b/include/ctdb.h 2007-04-16 00:31:39 +0000
@@ -56,6 +56,11 @@
#define CTDB_FLAG_CONNECT_WAIT (1<<2)
+/*
+ a message handler ID meaning "give me all messages"
+ */
+#define CTDB_SRVID_ALL 0xFFFFFFFF
+
struct event_context;
/*
More information about the samba-cvs
mailing list