]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: can override master zone config
authorYehuda Sadeh <yehuda@redhat.com>
Fri, 16 Oct 2015 21:52:44 +0000 (14:52 -0700)
committerYehuda Sadeh <yehuda@redhat.com>
Fri, 12 Feb 2016 00:13:15 +0000 (16:13 -0800)
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
src/rgw/rgw_rados.cc

index 118d8d4558477de6821d77c62ca473efbcc0ef4e..139f4fefc562d2688f847291616d69ff4f7d9aaf 100644 (file)
@@ -235,9 +235,7 @@ int RGWZoneGroup::add_zone(const RGWZoneParams& zone_params, bool is_master, con
 {
   if (is_master) {
     if (!master_zone.empty() && master_zone != zone_params.get_id()) {
-      lderr(cct) << "Master zone already defined " << master_zone  << " cannot add zone "
-                << zone_params.get_id() << dendl;
-      return -EINVAL;
+      ldout(cct, 0) << "NOTICE: overriding master zone: " << master_zone  << dendl;
     }
     master_zone = zone_params.get_id();
   } else if (master_zone == zone_params.get_id()) {