From: Orit Wasserman <owasserm@redhat.com>
Date: Tue, 8 Dec 2015 16:13:15 +0000 (+0100)
Subject: rgw: create_default cannot set as default
X-Git-Tag: v10.1.0~354^2~132
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=845bf22ece7cd5d392762600e49654ab8bb970ec;p=ceph.git

rgw: create_default cannot set as default

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index d7421c2c37e2..c9023ee12ed2 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -179,11 +179,6 @@ int RGWZoneGroup::create_default(bool old_format)
     }
   }
 
-  r = set_as_default(); /* set this as default even if we weren't the creators */
-  if (r < 0) {
-    return r;
-  }
-
   if (old_format) {
     name = id;
   }
@@ -1323,7 +1318,6 @@ int RGWZoneParams::create_default(bool old_format)
     name = id;
   }
 
-  r = set_as_default();
   return r;
 }