From: Josh Durgin <josh.durgin@dreamhost.com>
Date: Mon, 14 Mar 2011 17:33:15 +0000 (-0700)
Subject: testlibrbdpp: read conf file and don't double-delete AioCompletion
X-Git-Tag: v0.26~142
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a94cf48baf4a33ee34a4ceca2ae168fc536ff431;p=ceph.git

testlibrbdpp: read conf file and don't double-delete AioCompletion

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
---

diff --git a/src/testlibrbdpp.cc b/src/testlibrbdpp.cc
index eb51db7226fa..67b4e1446288 100644
--- a/src/testlibrbdpp.cc
+++ b/src/testlibrbdpp.cc
@@ -171,7 +171,6 @@ void aio_write_test_data(librbd::Image& image, const char *test_data, off_t off)
   assert(r == 0);
   printf("finished write\n");
   comp->release();
-  delete comp;
 }
 
 void write_test_data(librbd::Image& image, const char *test_data, off_t off)
@@ -199,7 +198,6 @@ void aio_read_test_data(librbd::Image& image, const char *expected, off_t off)
   assert(strncmp(expected, bl.c_str(), TEST_IO_SIZE - 1) == 0);
   printf("finished read\n");
   comp->release();
-  delete comp;
 }
 
 void read_test_data(librbd::Image& image, const char *expected, off_t off)
@@ -247,6 +245,8 @@ int main(int argc, const char **argv)
   librbd::Image image;
   rbd = new librbd::RBD();
   assert(rados.init(NULL) == 0);
+  assert(rados.conf_read_file("/etc/ceph/ceph.conf") == 0);
+  rados.reopen_log();
   assert(rados.connect() == 0);
   if (rados.pool_lookup(TEST_POOL) != -ENOENT) {
     int r = rados.pool_delete(TEST_POOL);