From: Yehuda Sadeh <yehuda@redhat.com>
Date: Thu, 18 Feb 2016 23:25:52 +0000 (-0800)
Subject: rgw: add drain_all() before exiting a cr
X-Git-Tag: v10.1.0~354^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ac168e3f00fe90f79907ee814ad4043e4f43ab3f;p=ceph.git

rgw: add drain_all() before exiting a cr

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/rgw/rgw_sync.cc b/src/rgw/rgw_sync.cc
index fbf3e56889b9..bcb6d02b65f1 100644
--- a/src/rgw/rgw_sync.cc
+++ b/src/rgw/rgw_sync.cc
@@ -1566,6 +1566,7 @@ public:
         // wait for each shard to complete
         collect(&ret);
         if (ret < 0) {
+          drain_all();
           return set_cr_error(ret);
         }
         drain_all();