]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: finish error_repo cr in stop_spawned_services() 10073/head
authorYehuda Sadeh <yehuda@redhat.com>
Wed, 29 Jun 2016 21:50:12 +0000 (14:50 -0700)
committerNathan Cutler <ncutler@suse.com>
Thu, 30 Jun 2016 20:37:38 +0000 (22:37 +0200)
Fixes: http://tracker.ceph.com/issues/16530
Need to call finish, otherwise drain_all() wouldn't be able to
drain it.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 492bb608733c83a5d85319cf47c4d86402344376)

src/rgw/rgw_data_sync.cc

index 434e0f37014a0a56fbbc6413355db899c84d4614..cad3be7b560fc7b630fae5e5dc22c81e6ebee09c 100644 (file)
@@ -1182,6 +1182,7 @@ public:
   void stop_spawned_services() {
     lease_cr->go_down();
     if (error_repo) {
+      error_repo->finish();
       error_repo->put();
       error_repo = NULL;
     }