ctdb-tests: Replace ctdb_update_record_persistent with update_record_persistent
authorAmitay Isaacs <amitay@gmail.com>
Wed, 20 Apr 2016 04:29:56 +0000 (14:29 +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/72_update_record_persistent.sh
ctdb/tests/src/ctdb_update_record_persistent.c [deleted file]
ctdb/tests/src/update_record_persistent.c [new file with mode: 0644]
ctdb/wscript

index f40933278e620324b527f9ac9869704b5050ca17..8f028d0d0f11807f2c2f849c1c3b410679bfa15c 100755 (executable)
@@ -61,7 +61,8 @@ fi
 
 # 4,
 echo "Create a new record in the persistent database using UPDATE_RECORD"
-try_command_on_node 0 $CTDB_TEST_WRAPPER ctdb_update_record_persistent  --database="$test_db" --record=Update_Record_Persistent --value=FirstValue
+try_command_on_node 0 $CTDB_TEST_WRAPPER $VALGRIND update_record_persistent \
+       -D "$test_db" -k "Update_Record_Persistent" -v "FirstValue"
 
 try_command_on_node 0 "$CTDB cattdb "$test_db" | grep 'FirstValue' | wc -l"
 if [ "$out" = 1 ] ; then
@@ -73,7 +74,8 @@ fi
 
 # 5,
 echo Modify an existing record in the persistent database using UPDATE_RECORD
-try_command_on_node 0 $CTDB_TEST_WRAPPER ctdb_update_record_persistent  --database="$test_db" --record=Update_Record_Persistent --value=SecondValue
+try_command_on_node 0 $CTDB_TEST_WRAPPER $VALGRIND update_record_persistent \
+       -D "$test_db" -k "Update_Record_Persistent" -v "SecondValue"
 
 try_command_on_node 0 "$CTDB cattdb "$test_db" | grep 'FirstValue' | wc -l"
 if [ "$out" = 0 ] ; then
diff --git a/ctdb/tests/src/ctdb_update_record_persistent.c b/ctdb/tests/src/ctdb_update_record_persistent.c
deleted file mode 100644 (file)
index 10dc54b..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-/* 
-   simple ctdb test tool
-   This test just creates/updates a record in a persistent database
-
-   Copyright (C) Ronnie Sahlberg 2012
-
-   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/tdb_wrap/tdb_wrap.h"
-#include "lib/util/time.h"
-
-#include "ctdb_private.h"
-#include "ctdb_client.h"
-
-#include "common/cmdline.h"
-#include "common/common.h"
-
-
-static void update_once(struct ctdb_context *ctdb, struct tevent_context *ev,
-                       struct ctdb_db_context *ctdb_db, char *record,
-                       char *value)
-{
-       TDB_DATA key, data, olddata;
-       struct ctdb_ltdb_header header;
-
-       memset(&header, 0, sizeof(header));
-
-       key.dptr  = (uint8_t *)record;
-       key.dsize = strlen(record);
-
-       data.dptr  = (uint8_t *)value;
-       data.dsize = strlen(value);
-
-       olddata = tdb_fetch(ctdb_db->ltdb->tdb, key);
-       if (olddata.dsize != 0) {
-               memcpy(&header, olddata.dptr, sizeof(header));
-       } 
-       header.rsn++;
-
-       if (ctdb_ctrl_updaterecord(ctdb, ctdb, timeval_zero(), CTDB_CURRENT_NODE, ctdb_db, key, &header, data) != 0) {
-               printf("Failed to update record\n");
-               exit(1);
-       }
-}
-
-/*
-  main program
-*/
-int main(int argc, const char *argv[])
-{
-       struct ctdb_context *ctdb;
-       char *test_db = NULL;
-       char *record = NULL;
-       char *value = NULL;
-       struct ctdb_db_context *ctdb_db;
-       struct tevent_context *ev;
-
-       struct poptOption popt_options[] = {
-               POPT_AUTOHELP
-               POPT_CTDB_CMDLINE
-               { "database",      'D', POPT_ARG_STRING, &test_db, 0, "database", "string" },
-               { "record",      'R', POPT_ARG_STRING, &record, 0, "record", "string" },
-               { "value",      'V', POPT_ARG_STRING, &value, 0, "value", "string" },
-               POPT_TABLEEND
-       };
-       int opt;
-       const char **extra_argv;
-       int extra_argc = 0;
-       poptContext pc;
-
-
-       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(5, 0));
-       if (ctdb == NULL) {
-               exit(1);
-       }
-
-       if (test_db == NULL) {
-               fprintf(stderr, "You must specify the database\n");
-               exit(10);
-       }
-
-       if (record == NULL) {
-               fprintf(stderr, "You must specify the record\n");
-               exit(10);
-       }
-
-       if (value == NULL) {
-               fprintf(stderr, "You must specify the value\n");
-               exit(10);
-       }
-
-       /* attach to a specific database */
-       ctdb_db = ctdb_attach(ctdb, timeval_current_ofs(5, 0), test_db, true, 0);
-       if (!ctdb_db) {
-               printf("ctdb_attach failed - %s\n", ctdb_errstr(ctdb));
-               exit(1);
-       }
-
-       printf("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);
-       }
-
-       update_once(ctdb, ev, ctdb_db, record, value);
-
-       return 0;
-}
diff --git a/ctdb/tests/src/update_record_persistent.c b/ctdb/tests/src/update_record_persistent.c
new file mode 100644 (file)
index 0000000..9323e37
--- /dev/null
@@ -0,0 +1,215 @@
+/*
+   Update a record in persistent database
+
+   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 "protocol/protocol_api.h"
+#include "client/client.h"
+#include "tests/src/test_options.h"
+#include "tests/src/cluster_wait.h"
+
+struct update_record_state {
+       struct tevent_context *ev;
+       struct ctdb_client_context *client;
+       struct ctdb_db_context *db;
+       int timelimit;
+       TDB_DATA key, data;
+};
+
+static void update_record_update_done(struct tevent_req *subreq);
+
+static struct tevent_req *update_record_send(TALLOC_CTX *mem_ctx,
+                                            struct tevent_context *ev,
+                                            struct ctdb_client_context *client,
+                                            struct ctdb_db_context *db,
+                                            const char *keystr,
+                                            const char *valuestr,
+                                            int timelimit)
+{
+       struct tevent_req *req, *subreq;
+       struct update_record_state *state;
+       struct ctdb_ltdb_header header;
+       struct ctdb_rec_buffer *recbuf;
+       struct ctdb_req_control request;
+       int ret;
+
+       req = tevent_req_create(mem_ctx, &state, struct update_record_state);
+       if (req == NULL) {
+               return NULL;
+       }
+
+       state->ev = ev;
+       state->client = client;
+       state->db = db;
+       state->timelimit = timelimit;
+       state->key.dptr = (uint8_t *)discard_const(keystr);
+       state->key.dsize = strlen(keystr);
+       state->data.dptr = (uint8_t *)discard_const(valuestr);
+       state->data.dsize = strlen(valuestr);
+
+       ret = ctdb_ltdb_fetch(state->db, state->key, &header, NULL, NULL);
+       if (ret != 0) {
+               tevent_req_error(req, ret);
+               return tevent_req_post(req, ev);
+       }
+
+       header.rsn += 1;
+
+       recbuf = ctdb_rec_buffer_init(state, ctdb_db_id(state->db));
+       if (tevent_req_nomem(recbuf, req)) {
+               return tevent_req_post(req, ev);
+       }
+
+       ret = ctdb_rec_buffer_add(state, recbuf, 0, &header,
+                                 state->key, state->data);
+       if (ret != 0) {
+               tevent_req_error(req, ret);
+               return tevent_req_post(req, ev);
+       }
+
+       ctdb_req_control_update_record(&request, recbuf);
+       subreq = ctdb_client_control_send(state, state->ev, state->client,
+                                         CTDB_CURRENT_NODE,
+                                         tevent_timeval_current_ofs(
+                                                 state->timelimit, 0),
+                                         &request);
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
+       }
+       tevent_req_set_callback(subreq, update_record_update_done, req);
+
+       talloc_free(recbuf);
+       return req;
+}
+
+static void update_record_update_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct update_record_state *state = tevent_req_data(
+               req, struct update_record_state);
+       struct ctdb_reply_control *reply;
+       int ret;
+       bool status;
+
+       status = ctdb_client_control_recv(subreq, &ret, state, &reply);
+       TALLOC_FREE(subreq);
+       if (! status) {
+               tevent_req_error(req, ret);
+               return;
+       }
+
+       ret = ctdb_reply_control_update_record(reply);
+       if (ret != 0) {
+               tevent_req_error(req, ret);
+               return;
+       }
+
+       talloc_free(reply);
+
+       tevent_req_done(req);
+}
+
+static bool update_record_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_database(argc, argv, &opts);
+       if (! status) {
+               exit(1);
+       }
+
+       if (opts->valuestr == NULL) {
+               fprintf(stderr, "Error: please specify key value (-v)\n");
+               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), %s\n",
+                       opts->socket, 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(), opts->dbname,
+                         CTDB_DB_FLAGS_PERSISTENT, &ctdb_db);
+       if (ret != 0) {
+               fprintf(stderr, "Failed to attach DB %s\n", opts->dbname);
+               exit(1);
+       }
+
+       req = update_record_send(mem_ctx, ev, client, ctdb_db,
+                                opts->keystr, opts->valuestr,
+                                opts->timelimit);
+       if (req == NULL) {
+               fprintf(stderr, "Memory allocation error\n");
+               exit(1);
+       }
+
+       tevent_req_poll(req, ev);
+
+       status = update_record_recv(req, &ret);
+       if (! status) {
+               fprintf(stderr, "update record failed\n");
+               exit(1);
+       }
+
+       talloc_free(mem_ctx);
+       return 0;
+}
index 208ae378f0b348b9f69a5473a5a22cf3ad2c7cdf..0bb9630ebfc167a61ea61ee877066dd6b7ec223e 100755 (executable)
@@ -678,7 +678,6 @@ def build(bld):
     ctdb_tests = [
         'rb_test',
         'ctdb_trackingdb_test',
-        'ctdb_update_record_persistent',
         'ctdb_store',
         'ctdb_traverse',
         'ctdb_randrec',
@@ -710,7 +709,8 @@ def build(bld):
         'fetch_readonly',
         'fetch_readonly_loop',
         'transaction_loop',
-        'update_record'
+        'update_record',
+        'update_record_persistent'
     ]
 
     for target in ctdb_tests: