From: Yehuda Sadeh <yehuda@redhat.com>
Date: Thu, 5 Mar 2015 21:03:02 +0000 (-0800)
Subject: rgw: flush watch after unregistering
X-Git-Tag: v0.94~50^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F3845%2Fhead;p=ceph.git

rgw: flush watch after unregistering

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

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 292454cb88e4..57ca5c198a76 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -1221,6 +1221,12 @@ int RGWRados::unwatch(uint64_t watch_handle)
 {
   int r = control_pool_ctx.unwatch2(watch_handle);
   if (r < 0) {
+    ldout(cct, 0) << "ERROR: rados->unwatch2() returned r=" << r << dendl;
+    return r;
+  }
+  r = rados->watch_flush();
+  if (r < 0) {
+    ldout(cct, 0) << "ERROR: rados->watch_flush() returned r=" << r << dendl;
     return r;
   }
   return 0;