]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
ctdb-tests: Replace ctdb_transaction with transaction_loop using new client API
authorAmitay Isaacs <amitay@gmail.com>
Mon, 18 Apr 2016 07:11:36 +0000 (17:11 +1000)
committerMartin Schwenke <martins@samba.org>
Fri, 22 Jul 2016 04:50:22 +0000 (06:50 +0200)
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
ctdb/tests/simple/53_ctdb_transaction.sh
ctdb/tests/simple/54_ctdb_transaction_recovery.sh
ctdb/tests/src/ctdb_transaction.c [deleted file]
ctdb/tests/src/transaction_loop.c [new file with mode: 0644]
ctdb/wscript

index aa9202fc90a0babe159f248eee9435da05d45b72..de81994f842d825acf7cc93cc2915fbffe0877b9 100755 (executable)
@@ -37,11 +37,8 @@ if [ -z "$CTDB_TEST_TIMELIMIT" ] ; then
     CTDB_TEST_TIMELIMIT=30
 fi
 
-# Add a timeout command to ensure this test completes if
-# ctdb_transaction gets stuck
-timeout_cmd="timeout $((CTDB_TEST_TIMELIMIT * 2))"
-
-t="$CTDB_TEST_WRAPPER $VALGRIND $timeout_cmd ctdb_transaction --timelimit=${CTDB_TEST_TIMELIMIT}"
+t="$CTDB_TEST_WRAPPER $VALGRIND transaction_loop \
+       -n ${num_nodes} -t ${CTDB_TEST_TIMELIMIT}"
 
 echo "Running ctdb_transaction on all $num_nodes nodes."
-try_command_on_node -v -p all "$t & $t"
+try_command_on_node -v -p all "$t"
index 78a6e992f5dffcd793b8c27f091cc0d567a33fba..ba045359ec4cdb719a9afda107403260f40d5cdf 100755 (executable)
@@ -56,17 +56,12 @@ if [ -z "$CTDB_TEST_TIMELIMIT" ] ; then
     CTDB_TEST_TIMELIMIT=30
 fi
 
-# Add a timeout command to ensure this test completes if
-# ctdb_transaction gets stuck.  This one can get more "stuck" than the
-# previous test because a recovery can stop it committing a
-# transaction.
-timeout_cmd="timeout 600"
-
-t="$CTDB_TEST_WRAPPER $VALGRIND $timeout_cmd ctdb_transaction --timelimit=${CTDB_TEST_TIMELIMIT}"
+t="$CTDB_TEST_WRAPPER $VALGRIND transaction_loop \
+       -n ${num_nodes} -t ${CTDB_TEST_TIMELIMIT}"
 
 echo "Starting recovery loop"
 recovery_loop_start
 
 echo "Running ctdb_transaction on all $num_nodes nodes."
-try_command_on_node -v -p all "$t & $t"
+try_command_on_node -v -p all "$t"
 
diff --git a/ctdb/tests/src/ctdb_transaction.c b/ctdb/tests/src/ctdb_transaction.c
deleted file mode 100644 (file)
index 4cc48f5..0000000
+++ /dev/null
@@ -1,312 +0,0 @@
-/* 
-   simple tool to test persistent databases
-
-   Copyright (C) Andrew Tridgell  2006-2007
-   Copyright (c) Ronnie sahlberg  2007
-   Copyright (C) Michael Adam     2009
-
-   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 "replace.h"
-#include "system/filesys.h"
-#include "system/network.h"
-
-#include <popt.h>
-#include <talloc.h>
-#include <tevent.h>
-
-#include "lib/util/debug.h"
-#include "lib/util/time.h"
-
-#include "ctdb_private.h"
-#include "ctdb_client.h"
-
-#include "common/cmdline.h"
-#include "common/common.h"
-#include "common/logging.h"
-
-static struct timeval tp1,tp2;
-
-static void start_timer(void)
-{
-       gettimeofday(&tp1,NULL);
-}
-
-static double end_timer(void)
-{
-       gettimeofday(&tp2,NULL);
-       return (tp2.tv_sec + (tp2.tv_usec*1.0e-6)) - 
-               (tp1.tv_sec + (tp1.tv_usec*1.0e-6));
-}
-
-static int timelimit = 10;
-static int delay = 0;
-static int verbose = 0;
-
-static unsigned int pnn;
-
-static TDB_DATA old_data;
-
-static bool success = false;
-
-static void print_counters(void)
-{
-       int i;
-       uint32_t *old_counters;
-
-       printf("[%4u] Counters: ", getpid());
-       old_counters = (uint32_t *)old_data.dptr;
-       for (i=0;i<old_data.dsize/sizeof(uint32_t); i++) {
-               printf("%6u ", old_counters[i]);
-       }
-       printf("\n");
-}
-
-static void each_second(struct tevent_context *ev, struct tevent_timer *te,
-                       struct timeval t, void *private_data)
-{
-       struct ctdb_context *ctdb = talloc_get_type(private_data, struct ctdb_context);
-
-       print_counters();
-
-       tevent_add_timer(ev, ctdb, timeval_current_ofs(1, 0), each_second, ctdb);
-}
-
-static void check_counters(struct ctdb_context *ctdb, TDB_DATA data)
-{
-       int i;
-       uint32_t *counters, *old_counters;
-       bool monotonous = true;
-
-       counters     = (uint32_t *)data.dptr;
-       old_counters = (uint32_t *)old_data.dptr;
-
-       /* check that all the counters are monotonic increasing */
-       for (i=0; i<old_data.dsize/sizeof(uint32_t); i++) {
-               if (counters[i]<old_counters[i]) {
-                       printf("[%4u] ERROR: counters has decreased for node %u  From %u to %u\n", 
-                              getpid(), i, old_counters[i], counters[i]);
-                       monotonous = false;
-               }
-       }
-
-       if (old_data.dsize != data.dsize) {
-               old_data.dsize = data.dsize;
-               old_data.dptr = talloc_realloc_size(ctdb, old_data.dptr, old_data.dsize);
-       }
-
-       memcpy(old_data.dptr, data.dptr, data.dsize);
-       if (verbose) print_counters();
-
-       success = monotonous;
-}
-
-
-static void do_sleep(unsigned int sec)
-{
-       unsigned int i;
-       for (i=0; i<sec; i++) {
-               if (verbose) printf(".");
-               sleep(1);
-       }
-       if (verbose) printf("\n");
-}
-
-static void test_store_records(struct ctdb_context *ctdb,
-                              struct tevent_context *ev)
-{
-       TDB_DATA key;
-       struct ctdb_db_context *ctdb_db;
-       int ret;
-       uint32_t *counters;
-       ctdb_db = ctdb_db_handle(ctdb, "transaction.tdb");
-
-       key.dptr = discard_const("testkey");
-       key.dsize = strlen((const char *)key.dptr)+1;
-
-       start_timer();
-       while ((timelimit == 0) || (end_timer() < timelimit)) {
-               TALLOC_CTX *tmp_ctx = talloc_new(ctdb);
-               TDB_DATA data;
-               struct ctdb_transaction_handle *h;
-
-               if (verbose) DEBUG(DEBUG_ERR, ("starting transaction\n"));
-               h = ctdb_transaction_start(ctdb_db, tmp_ctx);
-               if (h == NULL) {
-                       DEBUG(DEBUG_ERR, ("Failed to start transaction on node %d\n",
-                              ctdb_get_pnn(ctdb)));
-                       talloc_free(tmp_ctx);
-                       return;
-               }
-               if (verbose) DEBUG(DEBUG_ERR, ("transaction started\n"));
-               do_sleep(delay);
-
-               if (verbose) DEBUG(DEBUG_ERR, ("calling transaction_fetch\n"));
-               ret = ctdb_transaction_fetch(h, tmp_ctx, key, &data);
-               if (ret != 0) {
-                       DEBUG(DEBUG_ERR,("Failed to fetch record\n"));
-                       exit(1);
-               }
-               if (verbose) DEBUG(DEBUG_ERR, ("fetched data ok\n"));
-               do_sleep(delay);
-
-               if (data.dsize < sizeof(uint32_t) * (pnn+1)) {
-                       unsigned char *ptr = data.dptr;
-
-                       data.dptr = talloc_zero_size(tmp_ctx, sizeof(uint32_t) * (pnn+1));
-                       memcpy(data.dptr, ptr, data.dsize);
-                       talloc_free(ptr);
-
-                       data.dsize = sizeof(uint32_t) * (pnn+1);
-               }
-
-               if (data.dptr == NULL) {
-                       DEBUG(DEBUG_ERR, ("Failed to realloc array\n"));
-                       talloc_free(tmp_ctx);
-                       return;
-               }
-
-               counters = (uint32_t *)data.dptr;
-
-               /* bump our counter */
-               counters[pnn]++;
-
-               if (verbose) DEBUG(DEBUG_ERR, ("calling transaction_store\n"));
-               ret = ctdb_transaction_store(h, key, data);
-               if (ret != 0) {
-                       DEBUG(DEBUG_ERR,("Failed to store record\n"));
-                       exit(1);
-               }
-               if (verbose) DEBUG(DEBUG_ERR, ("stored data ok\n"));
-               do_sleep(delay);
-
-               if (verbose) DEBUG(DEBUG_ERR, ("calling transaction_commit\n"));
-               ret = ctdb_transaction_commit(h);
-               if (ret != 0) {
-                       DEBUG(DEBUG_ERR,("Failed to commit transaction\n"));
-                       check_counters(ctdb, data);
-                       exit(1);
-               }
-               if (verbose) DEBUG(DEBUG_ERR, ("transaction committed\n"));
-
-               /* store the counters and verify that they are sane */
-               if (verbose || (pnn == 0)) {
-                       check_counters(ctdb, data);
-               }
-
-               do_sleep(delay);
-
-               talloc_free(tmp_ctx);
-       }
-
-}
-
-/*
-  main program
-*/
-int main(int argc, const char *argv[])
-{
-       struct ctdb_context *ctdb;
-       struct ctdb_db_context *ctdb_db;
-       int unsafe_writes = 0;
-       struct poptOption popt_options[] = {
-               POPT_AUTOHELP
-               POPT_CTDB_CMDLINE
-               { "timelimit", 't', POPT_ARG_INT, &timelimit, 0, "timelimit", "integer" },
-               { "delay", 'D', POPT_ARG_INT, &delay, 0, "delay (in seconds) between operations", "integer" },
-               { "verbose", 'v', POPT_ARG_NONE,  &verbose, 0, "switch on verbose mode", NULL },
-               { "unsafe-writes", 'u', POPT_ARG_NONE, &unsafe_writes, 0, "do not use tdb transactions when writing", NULL },
-               POPT_TABLEEND
-       };
-       int opt;
-       const char **extra_argv;
-       int extra_argc = 0;
-       poptContext pc;
-       struct tevent_context *ev;
-
-       if (verbose) {
-               setbuf(stdout, (char *)NULL); /* don't buffer */
-       } else {
-               setlinebuf(stdout);
-       }
-
-       pc = poptGetContext(argv[0], argc, argv, popt_options, POPT_CONTEXT_KEEP_FIRST);
-
-       while ((opt = poptGetNextOpt(pc)) != -1) {
-               switch (opt) {
-               default:
-                       fprintf(stderr, "Invalid option %s: %s\n", 
-                               poptBadOption(pc, 0), poptStrerror(opt));
-                       exit(1);
-               }
-       }
-
-       /* setup the remaining options for the main program to use */
-       extra_argv = poptGetArgs(pc);
-       if (extra_argv) {
-               extra_argv++;
-               while (extra_argv[extra_argc]) extra_argc++;
-       }
-
-       ev = tevent_context_init(NULL);
-
-       ctdb = ctdb_cmdline_client(ev, timeval_current_ofs(3, 0));
-       if (ctdb == NULL) {
-               DEBUG(DEBUG_ERR, ("Could not attach to daemon\n"));
-               return 1;
-       }
-
-       /* attach to a specific database */
-       if (unsafe_writes == 1) {
-               ctdb_db = ctdb_attach(ctdb, timeval_current_ofs(2, 0),
-                                     "transaction.tdb", true, TDB_NOSYNC);
-       } else {
-               ctdb_db = ctdb_attach(ctdb, timeval_current_ofs(2, 0),
-                                     "transaction.tdb", true, 0);
-       }
-
-       if (!ctdb_db) {
-               DEBUG(DEBUG_ERR, ("ctdb_attach failed - %s\n", ctdb_errstr(ctdb)));
-               exit(1);
-       }
-
-       DEBUG(DEBUG_ERR, ("Waiting for cluster\n"));
-       while (1) {
-               uint32_t recmode=1;
-               ctdb_ctrl_getrecmode(ctdb, ctdb, timeval_zero(), CTDB_CURRENT_NODE, &recmode);
-               if (recmode == 0) break;
-               tevent_loop_once(ev);
-       }
-
-       pnn = ctdb_get_pnn(ctdb);
-       printf("Starting test on node %u. running for %u seconds. sleep delay: %u seconds.\n", pnn, timelimit, delay);
-
-       if (!verbose && (pnn == 0)) {
-               tevent_add_timer(ev, ctdb, timeval_current_ofs(1, 0),
-                                each_second, ctdb);
-       }
-
-       test_store_records(ctdb, ev);
-
-       if (verbose || (pnn == 0)) {
-               if (success != true) {
-                       printf("The test FAILED\n");
-                       return 1;
-               } else {
-                       printf("SUCCESS!\n");
-               }
-       }
-       return 0;
-}
diff --git a/ctdb/tests/src/transaction_loop.c b/ctdb/tests/src/transaction_loop.c
new file mode 100644 (file)
index 0000000..ca63bc8
--- /dev/null
@@ -0,0 +1,393 @@
+/*
+   simple ctdb benchmark for persistent databases
+
+   Copyright (C) Amitay Isaacs  2016
+
+   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 "replace.h"
+#include "system/network.h"
+
+#include "lib/util/tevent_unix.h"
+
+#include "client/client.h"
+#include "tests/src/test_options.h"
+#include "tests/src/cluster_wait.h"
+
+#define TESTDB "transaction_loop.tdb"
+#define TESTKEY        "testkey"
+
+
+struct transaction_loop_state {
+       struct tevent_context *ev;
+       struct ctdb_client_context *client;
+       struct ctdb_db_context *ctdb_db;
+       int num_nodes;
+       int timelimit;
+       TDB_DATA key;
+       uint32_t pnn;
+       struct ctdb_transaction_handle *h;
+       uint32_t *old_counter, *counter;
+       struct tevent_req *subreq;
+};
+
+static void transaction_loop_start(struct tevent_req *subreq);
+static void transaction_loop_started(struct tevent_req *subreq);
+static void transaction_loop_committed(struct tevent_req *subreq);
+static void transaction_loop_each_second(struct tevent_req *subreq);
+static bool transaction_loop_check_counters(struct tevent_req *req);
+static void transaction_loop_finish(struct tevent_req *subreq);
+
+static struct tevent_req *transaction_loop_send(
+                               TALLOC_CTX *mem_ctx,
+                               struct tevent_context *ev,
+                               struct ctdb_client_context *client,
+                               struct ctdb_db_context *ctdb_db,
+                               int num_nodes, int timelimit)
+{
+       struct tevent_req *req, *subreq;
+       struct transaction_loop_state *state;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct transaction_loop_state);
+       if (req == NULL) {
+               return NULL;
+       }
+
+       state->ev = ev;
+       state->client = client;
+       state->ctdb_db = ctdb_db;
+       state->num_nodes = num_nodes;
+       state->timelimit = timelimit;
+       state->key.dptr = discard_const(TESTKEY);
+       state->key.dsize = strlen(TESTKEY);
+       state->pnn = ctdb_client_pnn(client);
+       state->old_counter = talloc_zero_array(state, uint32_t, num_nodes);
+       if (tevent_req_nomem(state->old_counter, req)) {
+               return tevent_req_post(req, ev);
+       }
+       state->counter = talloc_zero_array(state, uint32_t, num_nodes);
+       if (tevent_req_nomem(state->counter, req)) {
+               return tevent_req_post(req, ev);
+       }
+
+       subreq = cluster_wait_send(state, state->ev, state->client,
+                                  state->num_nodes);
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
+       }
+       tevent_req_set_callback(subreq, transaction_loop_start, req);
+
+       return req;
+}
+
+static void transaction_loop_start(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct transaction_loop_state *state = tevent_req_data(
+               req, struct transaction_loop_state);
+       bool status;
+       int ret;
+
+       status = cluster_wait_recv(subreq, &ret);
+       TALLOC_FREE(subreq);
+       if (! status) {
+               tevent_req_error(req, ret);
+               return;
+       }
+
+       subreq = ctdb_transaction_start_send(state, state->ev, state->client,
+                                            tevent_timeval_current_ofs(
+                                                    state->timelimit, 0),
+                                            state->ctdb_db, false);
+       if (tevent_req_nomem(subreq, req)) {
+               return;
+       }
+       tevent_req_set_callback(subreq, transaction_loop_started, req);
+       state->subreq = subreq;
+
+       if (ctdb_client_pnn(state->client) == 0) {
+               subreq = tevent_wakeup_send(state, state->ev,
+                                           tevent_timeval_current_ofs(1, 0));
+               if (tevent_req_nomem(subreq, req)) {
+                       return;
+               }
+               tevent_req_set_callback(subreq, transaction_loop_each_second,
+                                       req);
+       }
+
+       subreq = tevent_wakeup_send(state, state->ev,
+                                   tevent_timeval_current_ofs(
+                                           state->timelimit, 0));
+       if (tevent_req_nomem(subreq, req)) {
+               return;
+       }
+       tevent_req_set_callback(subreq, transaction_loop_finish, req);
+}
+
+static void transaction_loop_started(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct transaction_loop_state *state = tevent_req_data(
+               req, struct transaction_loop_state);
+       TDB_DATA data;
+       int ret;
+       uint32_t *counter;
+
+       state->h = ctdb_transaction_start_recv(subreq, &ret);
+       TALLOC_FREE(subreq);
+       state->subreq = NULL;
+       if (state->h == NULL) {
+               fprintf(stderr, "transaction start failed\n");
+               tevent_req_error(req, ret);
+               return;
+       }
+
+       ret = ctdb_transaction_fetch_record(state->h, state->key,
+                                           state, &data);
+       if (ret != 0) {
+               tevent_req_error(req, ret);
+               return;
+       }
+
+       if (data.dsize < state->num_nodes * sizeof(uint32_t)) {
+               TALLOC_FREE(data.dptr);
+
+               data.dsize = state->num_nodes * sizeof(uint32_t);
+               data.dptr = (uint8_t *)talloc_zero_array(state, uint32_t,
+                                                        state->num_nodes);
+               if (tevent_req_nomem(data.dptr, req)) {
+                       return;
+               }
+       }
+
+       counter = (uint32_t *)data.dptr;
+       counter[state->pnn] += 1;
+       memcpy(state->counter, counter, state->num_nodes * sizeof(uint32_t));
+
+       ret = ctdb_transaction_store_record(state->h, state->key, data);
+       if (ret != 0) {
+               fprintf(stderr, "transaction store failed\n");
+               tevent_req_error(req, ret);
+               return;
+       }
+
+       subreq = ctdb_transaction_commit_send(state, state->ev,
+                                             tevent_timeval_current_ofs(
+                                                     state->timelimit, 0),
+                                             state->h);
+       if (tevent_req_nomem(subreq, req)) {
+               return;
+       }
+       tevent_req_set_callback(subreq, transaction_loop_committed, req);
+       state->subreq = subreq;
+}
+
+static void transaction_loop_committed(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct transaction_loop_state *state = tevent_req_data(
+               req, struct transaction_loop_state);
+       int ret;
+       bool status;
+
+       status = ctdb_transaction_commit_recv(subreq, &ret);
+       TALLOC_FREE(subreq);
+       state->subreq = NULL;
+       if (! status) {
+               fprintf(stderr, "transaction commit failed - %s\n",
+                       strerror(ret));
+               tevent_req_error(req, ret);
+               return;
+       }
+
+       if (state->pnn == 0) {
+               if (! transaction_loop_check_counters(req)) {
+                       return;
+               }
+       }
+
+       subreq = ctdb_transaction_start_send(state, state->ev, state->client,
+                                            tevent_timeval_current_ofs(
+                                                    state->timelimit, 0),
+                                            state->ctdb_db, false);
+       if (tevent_req_nomem(subreq, req)) {
+               return;
+       }
+       tevent_req_set_callback(subreq, transaction_loop_started, req);
+}
+
+static void transaction_loop_each_second(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct transaction_loop_state *state = tevent_req_data(
+               req, struct transaction_loop_state);
+       bool status;
+       int i;
+
+       status = tevent_wakeup_recv(subreq);
+       TALLOC_FREE(subreq);
+       if (! status) {
+               tevent_req_error(req, EIO);
+               return;
+       }
+
+       for (i=0; i<state->num_nodes; i++) {
+               printf("%6u ", state->counter[i]);
+       }
+       printf("\n");
+       fflush(stdout);
+
+       subreq = tevent_wakeup_send(state, state->ev,
+                                   tevent_timeval_current_ofs(1, 0));
+       if (tevent_req_nomem(subreq, req)) {
+               return;
+       }
+       tevent_req_set_callback(subreq, transaction_loop_each_second, req);
+}
+
+static bool transaction_loop_check_counters(struct tevent_req *req)
+{
+       struct transaction_loop_state *state = tevent_req_data(
+               req, struct transaction_loop_state);
+       int i;
+       bool monotonous = true;
+
+       for (i=0; i<state->num_nodes; i++) {
+               if (state->counter[i] < state->old_counter[i]) {
+                       fprintf(stderr,
+                               "Counter reduced for node %d: %u -> %u\n",
+                               i, state->old_counter[i], state->counter[i]);
+                       monotonous = false;
+                       break;
+               }
+       }
+
+       if (monotonous) {
+               memcpy(state->old_counter, state->counter,
+                      state->num_nodes * sizeof(uint32_t));
+       }
+
+       return monotonous;
+}
+
+static void transaction_loop_finish(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct transaction_loop_state *state = tevent_req_data(
+               req, struct transaction_loop_state);
+       bool status;
+       int i;
+
+       status = tevent_wakeup_recv(subreq);
+       TALLOC_FREE(subreq);
+       TALLOC_FREE(state->subreq);
+       if (! status) {
+               tevent_req_error(req, EIO);
+               return;
+       }
+
+       for (i=0; i<state->num_nodes; i++) {
+               printf("%6u ", state->counter[i]);
+       }
+       printf("\n");
+
+       tevent_req_done(req);
+}
+
+static bool transaction_loop_recv(struct tevent_req *req, int *perr)
+{
+       int err;
+
+       if (tevent_req_is_unix_error(req, &err)) {
+               if (perr != NULL) {
+                       *perr = err;
+               }
+               return false;
+       }
+       return true;
+}
+
+int main(int argc, const char *argv[])
+{
+       const struct test_options *opts;
+       TALLOC_CTX *mem_ctx;
+       struct tevent_context *ev;
+       struct ctdb_client_context *client;
+       struct ctdb_db_context *ctdb_db;
+       struct tevent_req *req;
+       int ret;
+       bool status;
+
+       status = process_options_basic(argc, argv, &opts);
+       if (! status) {
+               exit(1);
+       }
+
+       mem_ctx = talloc_new(NULL);
+       if (mem_ctx == NULL) {
+               fprintf(stderr, "Memory allocation error\n");
+               exit(1);
+       }
+
+       ev = tevent_context_init(mem_ctx);
+       if (ev == NULL) {
+               fprintf(stderr, "Memory allocation error\n");
+               exit(1);
+       }
+
+       ret = ctdb_client_init(mem_ctx, ev, opts->socket, &client);
+       if (ret != 0) {
+               fprintf(stderr, "Failed to initialize client, %s\n",
+                       strerror(ret));
+               exit(1);
+       }
+
+       if (! ctdb_recovery_wait(ev, client)) {
+               fprintf(stderr, "Memory allocation error\n");
+               exit(1);
+       }
+
+       ret = ctdb_attach(ev, client, tevent_timeval_zero(), TESTDB,
+                         CTDB_DB_FLAGS_PERSISTENT, &ctdb_db);
+       if (ret != 0) {
+               fprintf(stderr, "Failed to attach to persistent DB %s\n",
+                       TESTDB);
+               exit(1);
+       }
+
+       req = transaction_loop_send(mem_ctx, ev, client, ctdb_db,
+                                   opts->num_nodes, opts->timelimit);
+       if (req == NULL) {
+               fprintf(stderr, "Memory allocation error\n");
+               exit(1);
+       }
+
+       tevent_req_poll(req, ev);
+
+       status = transaction_loop_recv(req, &ret);
+       if (! status) {
+               fprintf(stderr, "transaction loop test failed\n");
+               exit(1);
+       }
+
+       talloc_free(mem_ctx);
+       return 0;
+}
index fcc433fb8282883d9842d4825617cf449f078085..4e23ea230541dd1149f6f1e47256711283f6eb0e 100755 (executable)
@@ -685,7 +685,6 @@ def build(bld):
         'ctdb_randrec',
         'ctdb_persistent',
         'ctdb_porting_tests',
-        'ctdb_transaction',
         'ctdb_lock_tdb'
     ]
 
@@ -710,7 +709,8 @@ def build(bld):
         'fetch_ring',
         'fetch_loop',
         'fetch_readonly',
-        'fetch_readonly_loop'
+        'fetch_readonly_loop',
+        'transaction_loop'
     ]
 
     for target in ctdb_tests: