create testrados_delete_pool_while_open

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>

diff --git a/src/.gitignore b/src/.gitignore
index 2e7ab2926df2d789537046dc2444da5568b8a869..5cafb84e74b31da1185725f439ea7ee4207b2188 100644 (file)
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -31,6 +31,7 @@
 /testkeys
 /testmsgr
 /testrados
+/testrados_delete_pool_while_open
 /testradospp
 /testdout_streambuf
 /testsignal_handlers

diff --git a/src/Makefile.am b/src/Makefile.am
index 5f1eb8abc881a328729ba49ae4d045e13baf0b9a..cffd09b0c1f20182de9d94b386233cc11727361a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -278,9 +278,11 @@ testrados_SOURCES = testrados.c
 testrados_LDADD = librados.la -lpthread -lm $(CRYPTO_LIBS) $(EXTRALIBS)
 testradospp_SOURCES = testradospp.cc
 testradospp_LDADD = librados.la -lpthread -lm
+testrados_delete_pool_while_open_SOURCES = test/testrados_delete_pool_while_open.c
+testrados_delete_pool_while_open_LDADD = librados.la -lpthread -lm $(CRYPTO_LIBS) $(EXTRALIBS)
 radosacl_SOURCES = radosacl.cc
 radosacl_LDADD = librados.la -lpthread -lm $(CRYPTO_LIBS) $(EXTRALIBS)
-bin_DEBUGPROGRAMS += testrados testradospp radosacl
+bin_DEBUGPROGRAMS += testrados testradospp radosacl testrados_delete_pool_while_open
 
 rbd_SOURCES = rbd.cc common/fiemap.cc common/secret.c
 rbd_CXXFLAGS = ${AM_CXXFLAGS}

diff --git a/src/test/testrados_delete_pool_while_open.c b/src/test/testrados_delete_pool_while_open.c
new file mode 100644 (file)
index 0000000..1370fe0
--- /dev/null
+++ b/src/test/testrados_delete_pool_while_open.c
@@ -0,0 +1,140 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+/*
+ * Ceph - scalable distributed file system
+ *
+ * Copyright (C) 2011 New Dream Network
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software
+ * Foundation.  See file COPYING.
+ *
+ */
+
+#include "include/rados/librados.h"
+
+#include <assert.h>
+#include <pthread.h>
+#include <semaphore.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+static sem_t creation_sem;
+static sem_t destruction_sem;
+
+/* sucess / failure codes for thread1 and thread2 */
+#define SUCCESS ((void*)NULL)
+#define FAILURE ((void*)0x1)
+
+static void* do_thread1(void *v)
+{
+       rados_t cl;
+       if (rados_create(&cl, NULL) < 0) {
+               printf("error initializing\n");
+               return FAILURE;
+       }
+       if (rados_conf_read_file(cl, NULL)) {
+               printf("error reading configuration file\n");
+               return FAILURE;
+       }
+       if (rados_connect(cl)) {
+               printf("error connecting\n");
+               return FAILURE;
+       }
+       if (rados_pool_create(cl, "foo")) {
+               printf("rados_pool_create error\n");
+               return FAILURE;
+       }
+       rados_ioctx_t io_ctx;
+       if (rados_ioctx_create(cl, "foo", &io_ctx)) {
+               printf("rados_ioctx_create error\n");
+               return FAILURE;
+       }
+       sem_post(&creation_sem);
+       sem_wait(&destruction_sem);
+       struct rados_pool_stat_t st;
+       int ret = rados_ioctx_pool_stat(io_ctx, &st);
+       if (ret) {
+               printf("rados_ioctx_pool_stat failed with error %d\n", ret);
+       }
+       else {
+               /* This should not succeed because the pool was deleted
+                * by the other thread. */
+               printf("rados_ioctx_pool_stat succeeded\n", ret);
+               return FAILURE;
+       }
+       rados_ioctx_destroy(io_ctx);
+       return SUCCESS;
+}
+
+static void* do_thread2(void *v)
+{
+       rados_t cl;
+       if (rados_create(&cl, NULL) < 0) {
+               printf("error initializing\n");
+               return FAILURE;
+       }
+       if (rados_conf_read_file(cl, NULL)) {
+               printf("error reading configuration file\n");
+               return FAILURE;
+       }
+       if (rados_connect(cl)) {
+               printf("error connecting\n");
+               return FAILURE;
+       }
+       sem_wait(&creation_sem);
+       if (rados_pool_delete(cl, "foo")) {
+               printf("rados_pool_delete error\n");
+               return FAILURE;
+       }
+       sem_post(&destruction_sem);
+       return SUCCESS;
+}
+
+int main(void)
+{
+       void *r;
+       int ret = 0;
+       pthread_t thread1, thread2;
+
+       if (sem_init(&creation_sem, 0, 0)) {
+               printf("sem_init failed.\n");
+               return EXIT_FAILURE;
+       }
+       if (sem_init(&destruction_sem, 0, 0)) {
+               printf("sem_init failed.\n");
+               return EXIT_FAILURE;
+       }
+
+       /* create threads */
+       if (pthread_create(&thread1, NULL, do_thread1, NULL)) {
+               printf("pthread_create failed.\n");
+               return EXIT_FAILURE;
+       }
+       if (pthread_create(&thread2, NULL, do_thread2, NULL)) {
+               printf("pthread_create failed.\n");
+               return EXIT_FAILURE;
+       }
+
+       /* wait for threads */
+       if (pthread_join(thread1, &r)) {
+               printf("pthread_join failed.\n");
+               return EXIT_FAILURE;
+       }
+       if (r != SUCCESS)
+               ret = 1;
+       if (pthread_join(thread2, &r)) {
+               printf("pthread_join failed.\n");
+               return EXIT_FAILURE;
+       }
+       if (r != SUCCESS)
+               ret = 1;
+
+       /* done */
+       if (ret)
+               printf("FAILURE\n");
+       else
+               printf("SUCCESS\n");
+       return ret;
+}

diff --git a/src/testrados.c b/src/testrados.c
index 838a116c7a20a40b4d126e071e6be679b4490f42..dc4087cb810befcf402fd3a00f2ffda159c18d1d 100644 (file)
--- a/src/testrados.c
+++ b/src/testrados.c
@@ -165,7 +165,7 @@ static int testrados(int tnum)
 
        /* create an io_ctx */
        r = rados_pool_create(cl, "foo");
-       tprintf(tnum, "rados_ioctx_create = %d\n", r);
+       tprintf(tnum, "rados_pool_create = %d\n", r);
 
        rados_ioctx_t io_ctx;
        r = rados_ioctx_create(cl, "foo", &io_ctx);