diff options
author | Amitay Isaacs <amitay@gmail.com> | 2013-02-21 13:16:15 +1100 |
---|---|---|
committer | Amitay Isaacs <amitay@gmail.com> | 2013-03-06 15:32:33 +1100 |
commit | 5d7efb4cf10dd230096d29449c37af3fca291eb5 (patch) | |
tree | 3f3030865bb9b281028f5a4ff6dae333a9c067d6 /ctdb/common/ctdb_message.c | |
parent | 8cd6a67b8bf055cae6caf75e4f45602b8f9e4a50 (diff) | |
download | samba-5d7efb4cf10dd230096d29449c37af3fca291eb5.tar.gz samba-5d7efb4cf10dd230096d29449c37af3fca291eb5.tar.xz samba-5d7efb4cf10dd230096d29449c37af3fca291eb5.zip |
ctdbd: Add an index db for message list for faster searches
When CTDB is busy with lots of smbd, CTDB was spending too much time in
daemon_check_srvids() which searches a list of srvids in the registered
message handlers. Using a hash based index significantly improves the
performance of search in a linked list.
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
(This used to be ctdb commit 3e09f25d419635f6dd679b48fa65370f7860be7d)
Diffstat (limited to 'ctdb/common/ctdb_message.c')
-rw-r--r-- | ctdb/common/ctdb_message.c | 205 |
1 files changed, 192 insertions, 13 deletions
diff --git a/ctdb/common/ctdb_message.c b/ctdb/common/ctdb_message.c index 5fc7b22a497..50d21890f8f 100644 --- a/ctdb/common/ctdb_message.c +++ b/ctdb/common/ctdb_message.c @@ -2,6 +2,7 @@ ctdb_message protocol code Copyright (C) Andrew Tridgell 2007 + Copyright (C) Amitay Isaacs 2013 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -27,16 +28,103 @@ #include "../include/ctdb_private.h" #include "lib/util/dlinklist.h" +static int message_list_db_init(struct ctdb_context *ctdb) +{ + ctdb->message_list_indexdb = tdb_open("messagedb", 8192, + TDB_INTERNAL|TDB_DISALLOW_NESTING, + O_RDWR|O_CREAT, 0); + if (ctdb->message_list_indexdb == NULL) { + DEBUG(DEBUG_ERR, ("Failed to create message list indexdb\n")); + return -1; + } + + return 0; +} + +static int message_list_db_add(struct ctdb_context *ctdb, TDB_DATA key, TDB_DATA data) +{ + int ret; + + if (ctdb->message_list_indexdb == NULL) { + ret = message_list_db_init(ctdb); + if (ret < 0) { + return -1; + } + } + + ret = tdb_store(ctdb->message_list_indexdb, key, data, TDB_INSERT); + if (ret < 0) { + DEBUG(DEBUG_ERR, ("Failed to add message list handler (%s)\n", + tdb_errorstr(ctdb->message_list_indexdb))); + return -1; + } + + return 0; +} + +static int message_list_db_delete(struct ctdb_context *ctdb, TDB_DATA key) +{ + int ret; + + if (ctdb->message_list_indexdb == NULL) { + return -1; + } + + ret = tdb_delete(ctdb->message_list_indexdb, key); + if (ret < 0) { + DEBUG(DEBUG_ERR, ("Failed to delete message list handler (%s)\n", + tdb_errorstr(ctdb->message_list_indexdb))); + return -1; + } + + return 0; +} + +static int message_list_db_fetch(struct ctdb_context *ctdb, TDB_DATA key, TDB_DATA *data) +{ + if (ctdb->message_list_indexdb == NULL) { + return -1; + } + + *data = tdb_fetch(ctdb->message_list_indexdb, key); + if (data->dsize == 0) { + return -1; + } + return 0; +} + /* this dispatches the messages to the registered ctdb message handler */ int ctdb_dispatch_message(struct ctdb_context *ctdb, uint64_t srvid, TDB_DATA data) { - struct ctdb_message_list *ml; + struct ctdb_message_list_header *h; + struct ctdb_message_list *m; + TDB_DATA key, hdata; + uint64_t srvid_all = CTDB_SRVID_ALL; + int ret; + + key.dptr = (uint8_t *)&srvid; + key.dsize = sizeof(uint64_t); + + ret = message_list_db_fetch(ctdb, key, &hdata); + if (ret == 0) { + h = *(struct ctdb_message_list_header **)hdata.dptr; - for (ml=ctdb->message_list;ml;ml=ml->next) { - if (ml->srvid == srvid || ml->srvid == CTDB_SRVID_ALL) { - ml->message_handler(ctdb, srvid, data, ml->message_private); + for (m=h->m; m; m=m->next) { + m->message_handler(ctdb, srvid, data, m->message_private); + } + } + + key.dptr = (uint8_t *)&srvid_all; + key.dsize = sizeof(uint64_t); + + ret = message_list_db_fetch(ctdb, key, &hdata); + if (ret == 0) { + h = *(struct ctdb_message_list_header **)hdata.dptr; + + for(m=h->m; m; m=m->next) { + m->message_handler(ctdb, srvid, data, m->message_private); } } @@ -57,13 +145,37 @@ void ctdb_request_message(struct ctdb_context *ctdb, struct ctdb_req_header *hdr ctdb_dispatch_message(ctdb, c->srvid, data); } +/* + * When header is freed, remove all the srvid handlers + */ +static int message_header_destructor(struct ctdb_message_list_header *h) +{ + struct ctdb_message_list *m; + TDB_DATA key; + + while (h->m != NULL) { + m = h->m; + DLIST_REMOVE(h->m, m); + TALLOC_FREE(m); + } + + key.dptr = (uint8_t *)&h->srvid; + key.dsize = sizeof(uint64_t); + + message_list_db_delete(h->ctdb, key); + DLIST_REMOVE(h->ctdb->message_list_header, h); + + return 0; +} /* when a client goes away, we need to remove its srvid handler from the list */ static int message_handler_destructor(struct ctdb_message_list *m) { - DLIST_REMOVE(m->ctdb->message_list, m); + struct ctdb_message_list_header *h = m->h; + + DLIST_REMOVE(h->m, m); return 0; } @@ -76,20 +188,47 @@ int ctdb_register_message_handler(struct ctdb_context *ctdb, ctdb_msg_fn_t handler, void *private_data) { + struct ctdb_message_list_header *h; struct ctdb_message_list *m; + TDB_DATA key, data; + int ret; - m = talloc(mem_ctx, struct ctdb_message_list); + m = talloc_zero(mem_ctx, struct ctdb_message_list); CTDB_NO_MEMORY(ctdb, m); - m->ctdb = ctdb; - m->srvid = srvid; m->message_handler = handler; m->message_private = private_data; - - DLIST_ADD(ctdb->message_list, m); - talloc_set_destructor(m, message_handler_destructor); + key.dptr = (uint8_t *)&srvid; + key.dsize = sizeof(uint64_t); + + ret = message_list_db_fetch(ctdb, key, &data); + if (ret < 0) { + /* srvid not registered yet */ + h = talloc_zero(ctdb, struct ctdb_message_list_header); + CTDB_NO_MEMORY(ctdb, h); + + h->ctdb = ctdb; + h->srvid = srvid; + + data.dptr = (uint8_t *)&h; + data.dsize = sizeof(struct ctdb_message_list_header *); + ret = message_list_db_add(ctdb, key, data); + if (ret < 0) { + talloc_free(m); + talloc_free(h); + return -1; + } + DLIST_ADD(ctdb->message_list_header, h); + talloc_set_destructor(h, message_header_destructor); + } else { + h = *(struct ctdb_message_list_header **)data.dptr; + } + + m->h = h; + DLIST_ADD(h->m, m); + talloc_set_destructor(m, message_handler_destructor); return 0; } @@ -99,13 +238,53 @@ int ctdb_register_message_handler(struct ctdb_context *ctdb, */ int ctdb_deregister_message_handler(struct ctdb_context *ctdb, uint64_t srvid, void *private_data) { + struct ctdb_message_list_header *h; struct ctdb_message_list *m; + TDB_DATA key, data; + int ret; + + key.dptr = (uint8_t *)&srvid; + key.dsize = sizeof(uint64_t); + + ret = message_list_db_fetch(ctdb, key, &data); + if (ret < 0) { + return -1; + } - for (m=ctdb->message_list;m;m=m->next) { - if (m->srvid == srvid && m->message_private == private_data) { + h = *(struct ctdb_message_list_header **)data.dptr; + for (m=h->m; m; m=m->next) { + if (m->message_private == private_data) { talloc_free(m); + if (h->m == NULL) { + talloc_free(h); + } return 0; } } + return -1; } + + +/* + * check if the given srvid exists + */ +bool ctdb_check_message_handler(struct ctdb_context *ctdb, uint64_t srvid) +{ + struct ctdb_message_list_header *h; + TDB_DATA key, data; + + key.dptr = (uint8_t *)&srvid; + key.dsize = sizeof(uint64_t); + + if (message_list_db_fetch(ctdb, key, &data) < 0) { + return false; + } + + h = *(struct ctdb_message_list_header **)data.dptr; + if (h->m == NULL) { + return false; + } + + return true; +} |