Merge pull request #4734 from wonzhq/aio-completion

test/aio: fix the leak of aio completion Reviewed-by: Kefu Chai <kchai@redhat.com>
ceph · May 22, 2015 · 6a7aa6c · 6a7aa6c
2 parents c2c36bc + 855a70d
commit 6a7aa6c
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/test/librados/aio.cc b/src/test/librados/aio.cc
@@ -209,17 +209,19 @@ TEST(LibRadosAio, SimpleWrite) {
   ASSERT_EQ(0, rados_aio_get_return_value(my_completion));
 
   rados_ioctx_set_namespace(test_data.m_ioctx, "nspace");
+  rados_completion_t my_completion2;
   ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data,
-	      set_completion_complete, set_completion_safe, &my_completion));
+	      set_completion_complete, set_completion_safe, &my_completion2));
   ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo",
-			       my_completion, buf, sizeof(buf), 0));
+			       my_completion2, buf, sizeof(buf), 0));
   {
     TestAlarm alarm;
     sem_wait(&test_data.m_sem);
     sem_wait(&test_data.m_sem);
   }
-  ASSERT_EQ(0, rados_aio_get_return_value(my_completion));
+  ASSERT_EQ(0, rados_aio_get_return_value(my_completion2));
   rados_aio_release(my_completion);
+  rados_aio_release(my_completion2);
 }
 
 TEST(LibRadosAio, SimpleWritePP) {
@@ -1806,17 +1808,19 @@ TEST(LibRadosAioEC, SimpleWrite) {
   ASSERT_EQ(0, rados_aio_get_return_value(my_completion));
 
   rados_ioctx_set_namespace(test_data.m_ioctx, "nspace");
+  rados_completion_t my_completion2;
   ASSERT_EQ(0, rados_aio_create_completion((void*)&test_data,
-	      set_completion_completeEC, set_completion_safeEC, &my_completion));
+	      set_completion_completeEC, set_completion_safeEC, &my_completion2));
   ASSERT_EQ(0, rados_aio_write(test_data.m_ioctx, "foo",
-			       my_completion, buf, sizeof(buf), 0));
+			       my_completion2, buf, sizeof(buf), 0));
   {
     TestAlarm alarm;
     sem_wait(&test_data.m_sem);
     sem_wait(&test_data.m_sem);
   }
-  ASSERT_EQ(0, rados_aio_get_return_value(my_completion));
+  ASSERT_EQ(0, rados_aio_get_return_value(my_completion2));
   rados_aio_release(my_completion);
+  rados_aio_release(my_completion2);
 }
 
 TEST(LibRadosAioEC, SimpleWritePP) {