From: Orit Wasserman <owasserm@redhat.com>
Date: Mon, 12 Dec 2016 13:00:05 +0000 (+0100)
Subject: rgw: complete versioning enablement after sending it to meta master
X-Git-Tag: v12.0.0~85^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2d8aafb9dbe64bd9dd2b7d5ed50c6e9550cbe1ab;p=ceph.git

rgw: complete versioning enablement after sending it to meta master

Fixes: http://tracker.ceph.com/issues/18003
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 9c6bd34c292..fb5a31c64ff 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -1747,8 +1747,8 @@ void RGWSetBucketVersioning::execute()
     op_ret = forward_request_to_master(s, NULL, store, in_data, nullptr);
     if (op_ret < 0) {
       ldout(s->cct, 20) << __func__ << "forward_request_to_master returned ret=" << op_ret << dendl;
+      return;
     }
-    return;
   }
 
   if (enable_versioning) {