From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 4 Dec 2018 21:18:12 +0000 (-0500)
Subject: rgw: remove zonegroup self-comparison
X-Git-Tag: v14.1.0~618^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8094ec2176affa95725368b4fa7679c853b959fa;p=ceph.git

rgw: remove zonegroup self-comparison

get_zonegroup() here is equivalent to *zonegroup

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/rgw/services/svc_zone.cc b/src/rgw/services/svc_zone.cc
index 2e1e67706808..2dc123262dd8 100644
--- a/src/rgw/services/svc_zone.cc
+++ b/src/rgw/services/svc_zone.cc
@@ -1013,16 +1013,9 @@ int RGWSI_Zone::select_bucket_location_by_rule(const string& location_rule, RGWZ
   map<string, RGWZonePlacementInfo>::iterator piter = get_zone_params().placement_pools.find(location_rule);
   if (piter == get_zone_params().placement_pools.end()) {
     /* couldn't find, means we cannot really place data for this bucket in this zone */
-    if (get_zonegroup().equals(zonegroup->get_id())) {
-      /* that's a configuration error, zone should have that rule, as we're within the requested
-       * zonegroup */
-      ldout(cct, 0) << "ERROR: This zone does not contain placement rule"
-                    << location_rule << " present in the zonegroup!" << dendl;
-      return -EINVAL;
-    } else {
-      /* oh, well, data is not going to be placed here, bucket object is just a placeholder */
-      return 0;
-    }
+    ldout(cct, 0) << "ERROR: This zone does not contain placement rule "
+                  << location_rule << " present in the zonegroup!" << dendl;
+    return -EINVAL;
   }
 
   RGWZonePlacementInfo& placement_info = piter->second;