]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: init_rados failed leads to repeated delete 6165/head
authorXiaowei Chen <cxwshawn@gmail.com>
Tue, 8 Sep 2015 10:58:57 +0000 (06:58 -0400)
committerLoic Dachary <ldachary@redhat.com>
Fri, 2 Oct 2015 15:13:10 +0000 (17:13 +0200)
Fixes: #12978
Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
(cherry picked from commit ab4232baa7bcc86e90746e13312ac9bda1772872)

src/rgw/rgw_rados.cc

index e71f6a2a65161639745955f15829b2fdc4786861..f439aeab11da94077a25896f946afbb0841cab43 100644 (file)
@@ -1504,10 +1504,13 @@ fail:
   for (uint32_t i=0; i < num_rados_handles; i++) {
     if (rados[i]) {
       delete rados[i];
+      rados[i] = NULL;
     }
   }
+  num_rados_handles = 0;
   if (rados) {
     delete[] rados;
+    rados = NULL;
   }
 
   return ret;