mirror of
https://github.com/samba-team/samba.git
synced 2024-12-25 23:21:54 +03:00
merged tridge's branch
(This used to be ctdb commit b40d044fc5b057b707a6f5637313c0836981a66e)
This commit is contained in:
commit
ddce8a5b6d
@ -126,6 +126,9 @@ static void daemon_request_register_message_handler(struct ctdb_client *client,
|
||||
if (res != 0) {
|
||||
DEBUG(0,(__location__ " Failed to register handler %u in daemon\n",
|
||||
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->call_data.dptr = c->data + c->keylen;
|
||||
call->call_data.dsize = c->calldatalen;
|
||||
call->flags = c->flags;
|
||||
|
||||
if (header.dmaster == ctdb->vnn && !(ctdb->flags & CTDB_FLAG_SELF_CONNECT)) {
|
||||
state = ctdb_call_local_send(ctdb_db, call, &header, &data);
|
||||
|
@ -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 == 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));
|
||||
/* no registered message handler */
|
||||
return -1;
|
||||
|
Loading…
Reference in New Issue
Block a user