[SCM] CTDB repository - branch master updated - ctdb-1.12-217-g0df4334
Michael Adam
obnox at samba.org
Tue Feb 21 10:19:37 MST 2012
The branch, master has been updated
via 0df433496f9c53a2c3759a62ebe355c35caff920 (commit)
via 400364a1d54404787cff48fb2c30c1b172a8b204 (commit)
via a956fa3a27106d0154a3fb46987d61c0a6b7c768 (commit)
from 67516f2eaf0b8b0f6aa4ecb0f1c44af53b992fbb (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0df433496f9c53a2c3759a62ebe355c35caff920
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 21 17:56:45 2012 +0100
server:update_record: remove some blood stains (trailing spaces...)
commit 400364a1d54404787cff48fb2c30c1b172a8b204
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 21 17:55:07 2012 +0100
server:update_record: make ctdb_childwrite static
commit a956fa3a27106d0154a3fb46987d61c0a6b7c768
Author: Michael Adam <obnox at samba.org>
Date: Tue Feb 21 17:53:26 2012 +0100
server: move the code for the update_record control to its own file
It is very misleading in ctdb_persistent.c, since it is used for non-persistent
dbs...
-----------------------------------------------------------------------
Summary of changes:
Makefile.in | 1 +
server/ctdb_persistent.c | 309 ---------------------------------------
server/ctdb_update_record.c | 335 +++++++++++++++++++++++++++++++++++++++++++
tests/src/ctdbd_test.c | 1 +
4 files changed, 337 insertions(+), 309 deletions(-)
create mode 100644 server/ctdb_update_record.c
Changeset truncated at 500 lines:
diff --git a/Makefile.in b/Makefile.in
index 52b2ef1..24283f3 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -75,6 +75,7 @@ CTDB_SERVER_OBJ = server/ctdbd.o server/ctdb_daemon.o server/ctdb_lockwait.o \
server/ctdb_serverids.o server/ctdb_persistent.o \
server/ctdb_keepalive.o server/ctdb_logging.o server/ctdb_uptime.o \
server/ctdb_vacuum.o server/ctdb_banning.o server/ctdb_statistics.o \
+ server/ctdb_update_record.o \
$(CTDB_CLIENT_OBJ) $(CTDB_TCP_OBJ) @INFINIBAND_WRAPPER_OBJ@
TEST_BINS=tests/bin/ctdb_bench tests/bin/ctdb_fetch tests/bin/ctdb_fetch_one \
diff --git a/server/ctdb_persistent.c b/server/ctdb_persistent.c
index dd8d479..ba93e8b 100644
--- a/server/ctdb_persistent.c
+++ b/server/ctdb_persistent.c
@@ -432,315 +432,6 @@ int32_t ctdb_control_trans3_commit(struct ctdb_context *ctdb,
}
-struct ctdb_persistent_write_state {
- struct ctdb_db_context *ctdb_db;
- struct ctdb_marshall_buffer *m;
- struct ctdb_req_control *c;
-};
-
-
-/*
- called from a child process to write the data
- */
-static int ctdb_persistent_store(struct ctdb_persistent_write_state *state)
-{
- int ret, i;
- struct ctdb_rec_data *rec = NULL;
- struct ctdb_marshall_buffer *m = state->m;
-
- ret = tdb_transaction_start(state->ctdb_db->ltdb->tdb);
- if (ret == -1) {
- DEBUG(DEBUG_ERR,("Failed to start transaction for db_id 0x%08x in ctdb_persistent_store\n",
- state->ctdb_db->db_id));
- return -1;
- }
-
- for (i=0;i<m->count;i++) {
- struct ctdb_ltdb_header oldheader;
- struct ctdb_ltdb_header header;
- TDB_DATA key, data, olddata;
- TALLOC_CTX *tmp_ctx = talloc_new(state);
-
- rec = ctdb_marshall_loop_next(m, rec, NULL, &header, &key, &data);
-
- if (rec == NULL) {
- DEBUG(DEBUG_ERR,("Failed to get next record %d for db_id 0x%08x in ctdb_persistent_store\n",
- i, state->ctdb_db->db_id));
- talloc_free(tmp_ctx);
- goto failed;
- }
-
- /* fetch the old header and ensure the rsn is less than the new rsn */
- ret = ctdb_ltdb_fetch(state->ctdb_db, key, &oldheader, tmp_ctx, &olddata);
- if (ret != 0) {
- DEBUG(DEBUG_ERR,("Failed to fetch old record for db_id 0x%08x in ctdb_persistent_store\n",
- state->ctdb_db->db_id));
- talloc_free(tmp_ctx);
- goto failed;
- }
-
- if (oldheader.rsn >= header.rsn &&
- (olddata.dsize != data.dsize ||
- memcmp(olddata.dptr, data.dptr, data.dsize) != 0)) {
- DEBUG(DEBUG_CRIT,("existing header for db_id 0x%08x has larger RSN %llu than new RSN %llu in ctdb_persistent_store\n",
- state->ctdb_db->db_id,
- (unsigned long long)oldheader.rsn, (unsigned long long)header.rsn));
- talloc_free(tmp_ctx);
- goto failed;
- }
-
- talloc_free(tmp_ctx);
-
- ret = ctdb_ltdb_store(state->ctdb_db, key, &header, data);
- if (ret != 0) {
- DEBUG(DEBUG_CRIT,("Failed to store record for db_id 0x%08x in ctdb_persistent_store\n",
- state->ctdb_db->db_id));
- goto failed;
- }
- }
-
- ret = tdb_transaction_commit(state->ctdb_db->ltdb->tdb);
- if (ret == -1) {
- DEBUG(DEBUG_ERR,("Failed to commit transaction for db_id 0x%08x in ctdb_persistent_store\n",
- state->ctdb_db->db_id));
- return -1;
- }
-
- return 0;
-
-failed:
- tdb_transaction_cancel(state->ctdb_db->ltdb->tdb);
- return -1;
-}
-
-
-/*
- called when we the child has completed the persistent write
- on our behalf
- */
-static void ctdb_persistent_write_callback(int status, void *private_data)
-{
- struct ctdb_persistent_write_state *state = talloc_get_type(private_data,
- struct ctdb_persistent_write_state);
-
-
- ctdb_request_control_reply(state->ctdb_db->ctdb, state->c, NULL, status, NULL);
-
- talloc_free(state);
-}
-
-/*
- called if our lockwait child times out
- */
-static void ctdb_persistent_lock_timeout(struct event_context *ev, struct timed_event *te,
- struct timeval t, void *private_data)
-{
- struct ctdb_persistent_write_state *state = talloc_get_type(private_data,
- struct ctdb_persistent_write_state);
- ctdb_request_control_reply(state->ctdb_db->ctdb, state->c, NULL, -1, "timeout in ctdb_persistent_lock");
- talloc_free(state);
-}
-
-struct childwrite_handle {
- struct ctdb_context *ctdb;
- struct ctdb_db_context *ctdb_db;
- struct fd_event *fde;
- int fd[2];
- pid_t child;
- void *private_data;
- void (*callback)(int, void *);
- struct timeval start_time;
-};
-
-static int childwrite_destructor(struct childwrite_handle *h)
-{
- CTDB_DECREMENT_STAT(h->ctdb, pending_childwrite_calls);
- kill(h->child, SIGKILL);
- return 0;
-}
-
-/* called when the child process has finished writing the record to the
- database
-*/
-static void childwrite_handler(struct event_context *ev, struct fd_event *fde,
- uint16_t flags, void *private_data)
-{
- struct childwrite_handle *h = talloc_get_type(private_data,
- struct childwrite_handle);
- void *p = h->private_data;
- void (*callback)(int, void *) = h->callback;
- pid_t child = h->child;
- TALLOC_CTX *tmp_ctx = talloc_new(ev);
- int ret;
- char c;
-
- CTDB_UPDATE_LATENCY(h->ctdb, h->ctdb_db, "persistent", childwrite_latency, h->start_time);
- CTDB_DECREMENT_STAT(h->ctdb, pending_childwrite_calls);
-
- /* the handle needs to go away when the context is gone - when
- the handle goes away this implicitly closes the pipe, which
- kills the child */
- talloc_steal(tmp_ctx, h);
-
- talloc_set_destructor(h, NULL);
-
- ret = read(h->fd[0], &c, 1);
- if (ret < 1) {
- DEBUG(DEBUG_ERR, (__location__ " Read returned %d. Childwrite failed\n", ret));
- c = 1;
- }
-
- callback(c, p);
-
- kill(child, SIGKILL);
- talloc_free(tmp_ctx);
-}
-
-/* this creates a child process which will take out a tdb transaction
- and write the record to the database.
-*/
-struct childwrite_handle *ctdb_childwrite(struct ctdb_db_context *ctdb_db,
- void (*callback)(int, void *private_data),
- struct ctdb_persistent_write_state *state)
-{
- struct childwrite_handle *result;
- int ret;
- pid_t parent = getpid();
-
- CTDB_INCREMENT_STAT(ctdb_db->ctdb, childwrite_calls);
- CTDB_INCREMENT_STAT(ctdb_db->ctdb, pending_childwrite_calls);
-
- if (!(result = talloc_zero(state, struct childwrite_handle))) {
- CTDB_DECREMENT_STAT(ctdb_db->ctdb, pending_childwrite_calls);
- return NULL;
- }
-
- ret = pipe(result->fd);
-
- if (ret != 0) {
- talloc_free(result);
- CTDB_DECREMENT_STAT(ctdb_db->ctdb, pending_childwrite_calls);
- return NULL;
- }
-
- result->child = ctdb_fork(ctdb_db->ctdb);
-
- if (result->child == (pid_t)-1) {
- close(result->fd[0]);
- close(result->fd[1]);
- talloc_free(result);
- CTDB_DECREMENT_STAT(ctdb_db->ctdb, pending_childwrite_calls);
- return NULL;
- }
-
- result->callback = callback;
- result->private_data = state;
- result->ctdb = ctdb_db->ctdb;
- result->ctdb_db = ctdb_db;
-
- if (result->child == 0) {
- char c = 0;
-
- close(result->fd[0]);
- debug_extra = talloc_asprintf(NULL, "childwrite-%s:", ctdb_db->db_name);
- ret = ctdb_persistent_store(state);
- if (ret != 0) {
- DEBUG(DEBUG_ERR, (__location__ " Failed to write persistent data\n"));
- c = 1;
- }
-
- write(result->fd[1], &c, 1);
-
- /* make sure we die when our parent dies */
- while (kill(parent, 0) == 0 || errno != ESRCH) {
- sleep(5);
- }
- _exit(0);
- }
-
- close(result->fd[1]);
- set_close_on_exec(result->fd[0]);
-
- talloc_set_destructor(result, childwrite_destructor);
-
- DEBUG(DEBUG_DEBUG, (__location__ " Created PIPE FD:%d for ctdb_childwrite\n", result->fd[0]));
-
- result->fde = event_add_fd(ctdb_db->ctdb->ev, result, result->fd[0],
- EVENT_FD_READ, childwrite_handler,
- (void *)result);
- if (result->fde == NULL) {
- talloc_free(result);
- CTDB_DECREMENT_STAT(ctdb_db->ctdb, pending_childwrite_calls);
- return NULL;
- }
- tevent_fd_set_auto_close(result->fde);
-
- result->start_time = timeval_current();
-
- return result;
-}
-
-/*
- update a record on this node if the new record has a higher rsn than the
- current record
- */
-int32_t ctdb_control_update_record(struct ctdb_context *ctdb,
- struct ctdb_req_control *c, TDB_DATA recdata,
- bool *async_reply)
-{
- struct ctdb_db_context *ctdb_db;
- struct ctdb_persistent_write_state *state;
- struct childwrite_handle *handle;
- struct ctdb_marshall_buffer *m = (struct ctdb_marshall_buffer *)recdata.dptr;
-
- if (ctdb->recovery_mode != CTDB_RECOVERY_NORMAL) {
- DEBUG(DEBUG_INFO,("rejecting ctdb_control_update_record when recovery active\n"));
- return -1;
- }
-
- ctdb_db = find_ctdb_db(ctdb, m->db_id);
- if (ctdb_db == NULL) {
- DEBUG(DEBUG_ERR,("Unknown database 0x%08x in ctdb_control_update_record\n", m->db_id));
- return -1;
- }
-
- if (ctdb_db->unhealthy_reason) {
- DEBUG(DEBUG_ERR,("db(%s) unhealty in ctdb_control_update_record: %s\n",
- ctdb_db->db_name, ctdb_db->unhealthy_reason));
- return -1;
- }
-
- state = talloc(ctdb, struct ctdb_persistent_write_state);
- CTDB_NO_MEMORY(ctdb, state);
-
- state->ctdb_db = ctdb_db;
- state->c = c;
- state->m = m;
-
- /* create a child process to take out a transaction and
- write the data.
- */
- handle = ctdb_childwrite(ctdb_db, ctdb_persistent_write_callback, state);
- if (handle == NULL) {
- DEBUG(DEBUG_ERR,("Failed to setup childwrite handler in ctdb_control_update_record\n"));
- talloc_free(state);
- return -1;
- }
-
- /* we need to wait for the replies */
- *async_reply = true;
-
- /* need to keep the control structure around */
- talloc_steal(state, c);
-
- /* but we won't wait forever */
- event_add_timed(ctdb->ev, state, timeval_current_ofs(ctdb->tunable.control_timeout, 0),
- ctdb_persistent_lock_timeout, state);
-
- return 0;
-}
-
-
/*
called when a client has finished a local commit in a transaction to
a persistent database
diff --git a/server/ctdb_update_record.c b/server/ctdb_update_record.c
new file mode 100644
index 0000000..4413597
--- /dev/null
+++ b/server/ctdb_update_record.c
@@ -0,0 +1,335 @@
+/*
+ implementation of the update record control
+
+ Copyright (C) Andrew Tridgell 2007
+ Copyright (C) Ronnie Sahlberg 2007
+
+ 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
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "lib/tevent/tevent.h"
+#include "db_wrap.h"
+#include "lib/tdb/include/tdb.h"
+#include "ctdb_private.h"
+
+struct ctdb_persistent_write_state {
+ struct ctdb_db_context *ctdb_db;
+ struct ctdb_marshall_buffer *m;
+ struct ctdb_req_control *c;
+};
+
+
+/*
+ called from a child process to write the data
+ */
+static int ctdb_persistent_store(struct ctdb_persistent_write_state *state)
+{
+ int ret, i;
+ struct ctdb_rec_data *rec = NULL;
+ struct ctdb_marshall_buffer *m = state->m;
+
+ ret = tdb_transaction_start(state->ctdb_db->ltdb->tdb);
+ if (ret == -1) {
+ DEBUG(DEBUG_ERR,("Failed to start transaction for db_id 0x%08x in ctdb_persistent_store\n",
+ state->ctdb_db->db_id));
+ return -1;
+ }
+
+ for (i=0;i<m->count;i++) {
+ struct ctdb_ltdb_header oldheader;
+ struct ctdb_ltdb_header header;
+ TDB_DATA key, data, olddata;
+ TALLOC_CTX *tmp_ctx = talloc_new(state);
+
+ rec = ctdb_marshall_loop_next(m, rec, NULL, &header, &key, &data);
+
+ if (rec == NULL) {
+ DEBUG(DEBUG_ERR,("Failed to get next record %d for db_id 0x%08x in ctdb_persistent_store\n",
+ i, state->ctdb_db->db_id));
+ talloc_free(tmp_ctx);
+ goto failed;
+ }
+
+ /* fetch the old header and ensure the rsn is less than the new rsn */
+ ret = ctdb_ltdb_fetch(state->ctdb_db, key, &oldheader, tmp_ctx, &olddata);
+ if (ret != 0) {
+ DEBUG(DEBUG_ERR,("Failed to fetch old record for db_id 0x%08x in ctdb_persistent_store\n",
+ state->ctdb_db->db_id));
+ talloc_free(tmp_ctx);
+ goto failed;
+ }
+
+ if (oldheader.rsn >= header.rsn &&
+ (olddata.dsize != data.dsize ||
+ memcmp(olddata.dptr, data.dptr, data.dsize) != 0)) {
+ DEBUG(DEBUG_CRIT,("existing header for db_id 0x%08x has larger RSN %llu than new RSN %llu in ctdb_persistent_store\n",
+ state->ctdb_db->db_id,
+ (unsigned long long)oldheader.rsn, (unsigned long long)header.rsn));
+ talloc_free(tmp_ctx);
+ goto failed;
+ }
+
+ talloc_free(tmp_ctx);
+
+ ret = ctdb_ltdb_store(state->ctdb_db, key, &header, data);
+ if (ret != 0) {
+ DEBUG(DEBUG_CRIT,("Failed to store record for db_id 0x%08x in ctdb_persistent_store\n",
+ state->ctdb_db->db_id));
+ goto failed;
+ }
+ }
+
+ ret = tdb_transaction_commit(state->ctdb_db->ltdb->tdb);
+ if (ret == -1) {
+ DEBUG(DEBUG_ERR,("Failed to commit transaction for db_id 0x%08x in ctdb_persistent_store\n",
+ state->ctdb_db->db_id));
+ return -1;
+ }
+
+ return 0;
+
+failed:
+ tdb_transaction_cancel(state->ctdb_db->ltdb->tdb);
+ return -1;
+}
+
+
+/*
+ called when we the child has completed the persistent write
+ on our behalf
+ */
+static void ctdb_persistent_write_callback(int status, void *private_data)
+{
+ struct ctdb_persistent_write_state *state = talloc_get_type(private_data,
+ struct ctdb_persistent_write_state);
+
+
+ ctdb_request_control_reply(state->ctdb_db->ctdb, state->c, NULL, status, NULL);
+
+ talloc_free(state);
+}
+
+/*
+ called if our lockwait child times out
+ */
+static void ctdb_persistent_lock_timeout(struct event_context *ev, struct timed_event *te,
+ struct timeval t, void *private_data)
+{
+ struct ctdb_persistent_write_state *state = talloc_get_type(private_data,
+ struct ctdb_persistent_write_state);
+ ctdb_request_control_reply(state->ctdb_db->ctdb, state->c, NULL, -1, "timeout in ctdb_persistent_lock");
+ talloc_free(state);
+}
+
+struct childwrite_handle {
+ struct ctdb_context *ctdb;
+ struct ctdb_db_context *ctdb_db;
+ struct fd_event *fde;
+ int fd[2];
+ pid_t child;
+ void *private_data;
+ void (*callback)(int, void *);
+ struct timeval start_time;
+};
+
+static int childwrite_destructor(struct childwrite_handle *h)
+{
+ CTDB_DECREMENT_STAT(h->ctdb, pending_childwrite_calls);
+ kill(h->child, SIGKILL);
+ return 0;
+}
+
+/* called when the child process has finished writing the record to the
+ database
+*/
+static void childwrite_handler(struct event_context *ev, struct fd_event *fde,
+ uint16_t flags, void *private_data)
+{
+ struct childwrite_handle *h = talloc_get_type(private_data,
+ struct childwrite_handle);
+ void *p = h->private_data;
--
CTDB repository
More information about the samba-cvs
mailing list