diff options
Diffstat (limited to 'ctdb/tests')
| -rw-r--r-- | ctdb/tests/cmdline.c | 6 | ||||
| -rw-r--r-- | ctdb/tests/ctdb_fetch.c | 9 | ||||
| -rw-r--r-- | ctdb/tests/ctdb_fetch1.c | 33 | ||||
| -rwxr-xr-x | ctdb/tests/fetch1.sh | 2 | ||||
| -rwxr-xr-x | ctdb/tests/test.sh | 13 | ||||
| -rwxr-xr-x | ctdb/tests/test1.sh | 4 |
6 files changed, 26 insertions, 41 deletions
diff --git a/ctdb/tests/cmdline.c b/ctdb/tests/cmdline.c index 57829b9e9bd..94d488a084a 100644 --- a/ctdb/tests/cmdline.c +++ b/ctdb/tests/cmdline.c @@ -31,13 +31,11 @@ static struct { const char *transport; const char *myaddress; int self_connect; - int daemon_mode; } ctdb_cmdline = { .nlist = NULL, .transport = "tcp", .myaddress = NULL, .self_connect = 0, - .daemon_mode = 0 }; @@ -46,7 +44,6 @@ struct poptOption popt_ctdb_cmdline[] = { { "listen", 0, POPT_ARG_STRING, &ctdb_cmdline.myaddress, 0, "address to listen on", "address" }, { "transport", 0, POPT_ARG_STRING, &ctdb_cmdline.transport, 0, "protocol transport", NULL }, { "self-connect", 0, POPT_ARG_NONE, &ctdb_cmdline.self_connect, 0, "enable self connect", "boolean" }, - { "daemon", 0, POPT_ARG_NONE, &ctdb_cmdline.daemon_mode, 0, "spawn a ctdb daemon", "boolean" }, { NULL } }; @@ -74,9 +71,6 @@ struct ctdb_context *ctdb_cmdline_init(struct event_context *ev) if (ctdb_cmdline.self_connect) { ctdb_set_flags(ctdb, CTDB_FLAG_SELF_CONNECT); } - if (ctdb_cmdline.daemon_mode) { - ctdb_set_flags(ctdb, CTDB_FLAG_DAEMON_MODE); - } ret = ctdb_set_transport(ctdb, ctdb_cmdline.transport); if (ret == -1) { diff --git a/ctdb/tests/ctdb_fetch.c b/ctdb/tests/ctdb_fetch.c index ebb7292c73b..a292dfb4432 100644 --- a/ctdb/tests/ctdb_fetch.c +++ b/ctdb/tests/ctdb_fetch.c @@ -61,14 +61,15 @@ static void bench_fetch_1node(struct ctdb_context *ctdb) struct ctdb_db_context *ctdb_db; TALLOC_CTX *tmp_ctx = talloc_new(ctdb); int dest, ret; + struct ctdb_record_handle *h; key.dptr = discard_const("testkey"); key.dsize = strlen((const char *)key.dptr); ctdb_db = ctdb_db_handle(ctdb, "test.tdb"); - ret = ctdb_client_fetch_lock(ctdb_db, tmp_ctx, key, &data); - if (ret != 0) { + h = ctdb_fetch_lock(ctdb_db, tmp_ctx, key, &data); + if (h == NULL) { printf("Failed to fetch record '%s' on node %d\n", (const char *)key.dptr, ctdb_get_vnn(ctdb)); talloc_free(tmp_ctx); @@ -87,11 +88,13 @@ static void bench_fetch_1node(struct ctdb_context *ctdb) msg_count, ctdb_get_vnn(ctdb)); data.dsize = strlen((const char *)data.dptr)+1; - ret = ctdb_client_store_unlock(ctdb_db, key, data); + ret = ctdb_record_store(h, data); if (ret != 0) { printf("Failed to store record\n"); } + printf("DATA IS NOW:%s\n", (const char *)data.dptr); + talloc_free(tmp_ctx); /* tell the next node to do the same */ diff --git a/ctdb/tests/ctdb_fetch1.c b/ctdb/tests/ctdb_fetch1.c index afae8c53cf1..635311c9980 100644 --- a/ctdb/tests/ctdb_fetch1.c +++ b/ctdb/tests/ctdb_fetch1.c @@ -47,6 +47,7 @@ void test1(struct ctdb_db_context *ctdb_db) { TDB_DATA key, data, data2, store_data; int ret; + struct ctdb_record_handle *h; /* test 1 : write data and read it back. should all be the same @@ -54,23 +55,24 @@ void test1(struct ctdb_db_context *ctdb_db) printf("Test1: write and verify we can read it back: "); key.dptr = discard_const("Record"); key.dsize = strlen((const char *)key.dptr)+1; - ret = ctdb_client_fetch_lock(ctdb_db, ctdb_db, key, &data); - if (ret!=0) { - printf("test1: ctdb_client_fetch_lock() failed\n"); + h = ctdb_fetch_lock(ctdb_db, ctdb_db, key, &data); + if (h == NULL) { + printf("test1: ctdb_fetch_lock() failed\n"); exit(1); } store_data.dptr = discard_const("data to store"); store_data.dsize = strlen((const char *)store_data.dptr)+1; - ret = ctdb_client_store_unlock(ctdb_db, key, store_data); + ret = ctdb_record_store(h, store_data); + talloc_free(h); if (ret!=0) { - printf("test1: ctdb_client_store_unlock() failed\n"); + printf("test1: ctdb_record_store() failed\n"); exit(1); } - ret = ctdb_client_fetch_lock(ctdb_db, ctdb_db, key, &data2); - if (ret!=0) { - printf("test1: ctdb_client_fetch_lock() failed\n"); + h = ctdb_fetch_lock(ctdb_db, ctdb_db, key, &data2); + if (h == NULL) { + printf("test1: ctdb_fetch_lock() failed\n"); exit(1); } @@ -83,9 +85,10 @@ void test1(struct ctdb_db_context *ctdb_db) } /* just write it back to unlock it */ - ret = ctdb_client_store_unlock(ctdb_db, key, store_data); + ret = ctdb_record_store(h, store_data); + talloc_free(h); if (ret!=0) { - printf("test1: ctdb_client_store_unlock() failed\n"); + printf("test1: ctdb_record_store() failed\n"); exit(1); } } @@ -94,7 +97,7 @@ void child(int srvid, struct event_context *ev, struct ctdb_context *ctdb, struc { TDB_DATA data; TDB_DATA key, data2; - int ret; + struct ctdb_record_handle *h; data.dptr=discard_const("dummy message"); data.dsize=strlen((const char *)data.dptr)+1; @@ -110,13 +113,13 @@ void child(int srvid, struct event_context *ev, struct ctdb_context *ctdb, struc /* fetch and lock the record */ key.dptr = discard_const("Record"); key.dsize = strlen((const char *)key.dptr)+1; - ret = ctdb_client_fetch_lock(ctdb_db, ctdb_db, key, &data2); - if (ret!=0) { - printf("client: ctdb_client_fetch_lock() failed\n"); + h = ctdb_fetch_lock(ctdb_db, ctdb_db, key, &data2); + if (h == NULL) { + printf("client: ctdb_fetch_lock() failed\n"); exit(1); } ctdb_send_message(ctdb, ctdb_get_vnn(ctdb), PARENT_SRVID, data); - + talloc_free(h); while (1) { event_loop_once(ev); diff --git a/ctdb/tests/fetch1.sh b/ctdb/tests/fetch1.sh index 4331a57d3e0..3562ca867e6 100755 --- a/ctdb/tests/fetch1.sh +++ b/ctdb/tests/fetch1.sh @@ -3,6 +3,6 @@ killall -q ctdb_fetch1 echo "Trying node" -bin/ctdb_fetch1 --nlist tests/1node.txt --listen 127.0.0.1:9001 --daemon $* +bin/ctdb_fetch1 --nlist tests/1node.txt --listen 127.0.0.1:9001 $* killall -q ctdb_fetch1 diff --git a/ctdb/tests/test.sh b/ctdb/tests/test.sh index 6197ce9616d..de7d8a342fb 100755 --- a/ctdb/tests/test.sh +++ b/ctdb/tests/test.sh @@ -19,17 +19,4 @@ sleep 3 killall ctdb_test -echo "Trying 2 nodes in daemon mode" -bin/ctdb_test --nlist tests/nodes.txt --listen 127.0.0.1:9001 --daemon & -bin/ctdb_test --nlist tests/nodes.txt --listen 127.0.0.2:9001 --daemon & -sleep 3 -killall ctdb_test - -echo "Trying 4 nodes in daemon mode" -bin/ctdb_test --nlist tests/4nodes.txt --listen 127.0.0.1:9001 --daemon & -bin/ctdb_test --nlist tests/4nodes.txt --listen 127.0.0.2:9001 --daemon & -bin/ctdb_test --nlist tests/4nodes.txt --listen 127.0.0.3:9001 --daemon & -bin/ctdb_test --nlist tests/4nodes.txt --listen 127.0.0.4:9001 --daemon & -sleep 3 -killall ctdb_test diff --git a/ctdb/tests/test1.sh b/ctdb/tests/test1.sh index 64d5c9fc873..f13799b45c7 100755 --- a/ctdb/tests/test1.sh +++ b/ctdb/tests/test1.sh @@ -1,8 +1,6 @@ #!/bin/sh -echo "Testing local send" -bin/ctdb_test --nlist tests/1node.txt --listen 127.0.0.1:9001 echo "Testing daemon mode" -bin/ctdb_test --nlist tests/1node.txt --listen 127.0.0.1:9001 --daemon +bin/ctdb_test --nlist tests/1node.txt --listen 127.0.0.1:9001 echo "Testing self connect" bin/ctdb_test --nlist tests/1node.txt --listen 127.0.0.1:9001 --self-connect |