From: Yehuda Sadeh <yehuda@redhat.com>
Date: Thu, 3 Mar 2016 21:04:36 +0000 (-0800)
Subject: rgw: don't override error when initializing zonegroup
X-Git-Tag: v10.1.0~230^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=905b1d9aa9500db1d9d78688d44229bc234ebb07;p=ceph.git

rgw: don't override error when initializing zonegroup

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

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 0bffc77c5ed4..80412210c706 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -362,13 +362,16 @@ int rgw_build_bucket_policies(RGWRados* store, struct req_state* s)
     s->bucket_owner = s->bucket_acl->get_owner();
 
     RGWZoneGroup zonegroup;
-    ret = store->get_zonegroup(s->bucket_info.zonegroup, zonegroup);
-    if (!ret) {
+    int r = store->get_zonegroup(s->bucket_info.zonegroup, zonegroup);
+    if (!r) {
       if (!zonegroup.endpoints.empty()) {
 	s->zonegroup_endpoint = zonegroup.endpoints.front();
       }
       s->zonegroup_name = zonegroup.get_name();
     }
+    if (r < 0 && ret == 0) {
+      ret = r;
+    }
 
     if (s->bucket_exists && !store->get_zonegroup().equals(s->bucket_info.zonegroup)) {
       ldout(s->cct, 0) << "NOTICE: request for data in a different zonegroup (" << s->bucket_info.zonegroup << " != " << store->get_zonegroup().get_id() << ")" << dendl;