sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00
Code

merged tridge's branch

Browse Source 
(This used to be ctdb commit b40d044fc5b057b707a6f5637313c0836981a66e)
This commit is contained in:
Peter Somogyi 2007-04-20 14:50:10 +02:00
commit ddce8a5b6d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ctdb/common/ctdb_daemon.c
View File

@ -126,6 +126,9 @@ static void daemon_request_register_message_handler(struct ctdb_client *client,
if (res != 0) { if (res != 0) {
DEBUG(0,(__location__ " Failed to register handler %u in daemon\n", DEBUG(0,(__location__ " Failed to register handler %u in daemon\n",
c->srvid)); c->srvid));
} else {
DEBUG(2,(__location__ " Registered message handler for srvid=%u\n",
c->srvid));
} }
} }
@ -363,6 +366,7 @@ static void daemon_request_call_from_client(struct ctdb_client *client,
call->key = key; call->key = key;
call->call_data.dptr = c->data + c->keylen; call->call_data.dptr = c->data + c->keylen;
call->call_data.dsize = c->calldatalen; call->call_data.dsize = c->calldatalen;
call->flags = c->flags;
if (header.dmaster == ctdb->vnn && !(ctdb->flags & CTDB_FLAG_SELF_CONNECT)) { if (header.dmaster == ctdb->vnn && !(ctdb->flags & CTDB_FLAG_SELF_CONNECT)) {
state = ctdb_call_local_send(ctdb_db, call, &header, &data); state = ctdb_call_local_send(ctdb_db, call, &header, &data);

2
ctdb/common/ctdb_message.c
View File

@ -42,7 +42,7 @@ static int ctdb_dispatch_message(struct ctdb_context *ctdb, uint32_t srvid, TDB_
if (ml->srvid == srvid || ml->srvid == CTDB_SRVID_ALL) break; if (ml->srvid == srvid || ml->srvid == CTDB_SRVID_ALL) break;
} }
if (ml == NULL) { if (ml == NULL) {
DEBUG(0,(__location__ " daemon vnn:%d no msg handler for srvid=%u\n", DEBUG(1,(__location__ " daemon vnn:%d no msg handler for srvid=%u\n",
ctdb_get_vnn(ctdb), srvid)); ctdb_get_vnn(ctdb), srvid));
/* no registered message handler */ /* no registered message handler */
return -1; return -1;