rgw: Add zone add command

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

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index a8232f77f103cde02be937275300c9365f2d6940..db2dc7eb5b9ed89c7ab223117658255866c23599 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -101,6 +101,7 @@ void _usage()
   cerr << "  zonegroups list            list all zone groups set on this cluster\n";
   cerr << "  zonegroup-map get          show zonegroup-map\n";
   cerr << "  zonegroup-map set          set zonegroup-map (requires infile)\n";
+  cerr << "  zone add                   add a zone to a zonegroup\n";
   cerr << "  zone create                create a new zone\n";
   cerr << "  zone get                   show zone cluster params\n";
   cerr << "  zone set                   set zone cluster params (requires infile)\n";
@@ -295,7 +296,8 @@ enum {
   OPT_ZONEGROUPMAP_GET,
   OPT_ZONEGROUPMAP_SET,
   OPT_ZONEGROUPMAP_UPDATE,
-  OPT_ZONE_CREATE,
+  OPT_ZONE_ADD,
+  OPT_ZONE_CREATE,  
   OPT_ZONE_DELETE,
   OPT_ZONE_GET,
   OPT_ZONE_SET,
@@ -564,6 +566,8 @@ static int get_cmd(const char *cmd, const char *prev_cmd, const char *prev_prev_
       return OPT_ZONE_DELETE;
     if (strcmp(cmd, "create") == 0)
       return OPT_ZONE_CREATE;
+    if (strcmp(cmd, "add") == 0)
+      return OPT_ZONE_ADD;
     if (strcmp(cmd, "get") == 0)
       return OPT_ZONE_GET;
     if (strcmp(cmd, "set") == 0)
@@ -1705,9 +1709,9 @@ int main(int argc, char **argv)
                         opt_cmd == OPT_ZONEGROUP_RENAME ||
                          opt_cmd == OPT_ZONEGROUPMAP_GET || opt_cmd == OPT_ZONEGROUPMAP_SET ||
                          opt_cmd == OPT_ZONEGROUPMAP_UPDATE ||
-                        opt_cmd == OPT_ZONE_CREATE || opt_cmd == OPT_ZONE_DELETE ||
+                        opt_cmd == OPT_ZONE_ADD || opt_cmd == OPT_ZONE_CREATE || opt_cmd == OPT_ZONE_DELETE ||
                          opt_cmd == OPT_ZONE_GET || opt_cmd == OPT_ZONE_SET || opt_cmd == OPT_ZONE_RENAME ||
-                         opt_cmd == OPT_ZONE_LIST || opt_cmd == OPT_ZONE_CREATE || opt_cmd == OPT_REALM_CREATE ||
+                         opt_cmd == OPT_ZONE_LIST || opt_cmd == OPT_REALM_CREATE ||
                         opt_cmd == OPT_PERIOD_PREPARE || opt_cmd == OPT_PERIOD_ACTIVATE ||
                         opt_cmd == OPT_PERIOD_DELETE || opt_cmd == OPT_PERIOD_GET ||
                         opt_cmd == OPT_PERIOD_GET_CURRENT || opt_cmd == OPT_PERIOD_LIST ||
@@ -2259,32 +2263,59 @@ int main(int argc, char **argv)
        formatter->flush(cout);
       }
       break;
-    case OPT_ZONE_CREATE:
+    case OPT_ZONE_ADD:
       {
        RGWZoneGroup zonegroup(zonegroup_id,zonegroup_name);
        int ret = zonegroup.init(g_ceph_context, store);
-       if (ret < 0 && ret != -ENOENT) {
-         cerr << "failed to initialize zonegroup " << zonegroup_name << std::endl;
+       if (ret < 0) {
+         cerr << "failed to initialize zonegroup " << zonegroup_name << " id " << zonegroup_id << " :"
+              << cpp_strerror(-ret) << std::endl;
          return ret;
        }
-       RGWZoneParams zone(zone_name);
-       ret = zone.init(g_ceph_context, store, zonegroup, false);
+       RGWZoneParams zone(zone_id, zone_name);
+       ret = zone.init(g_ceph_context, store, zonegroup);
        if (ret < 0) {
          cerr << "unable to initialize zone: " << cpp_strerror(-ret) << std::endl;
          return -ret;
        }
-       ret = zone.create();
-       if (ret < 0) {
-         cerr << "failed to create zone " << zone_name << ": " << cpp_strerror(-ret) << std::endl;
-         return ret;
-       }
        ret = zonegroup.add_zone(zone);
        if (ret < 0) {
          cerr << "failed to add zone " << zone_name << " to zonegroup " << zonegroup.get_name() << ": "
               << cpp_strerror(-ret) << std::endl;
          return ret;
        }
-
+      }
+      break;
+    case OPT_ZONE_CREATE:
+      {
+       int ret;
+       RGWZoneGroup zonegroup(zonegroup_id, zonegroup_name);
+       if (!zonegroup_id.empty() || !zonegroup_name.empty()) {
+         ret = zonegroup.init(g_ceph_context, store);
+         if (ret < 0) {
+           cerr << "unable to initialize zonegroup " << zonegroup_name << ": " << cpp_strerror(-ret) << std::endl;
+           return ret;
+         }
+       }
+       RGWZoneParams zone(zone_name, is_master);
+       ret = zone.init(g_ceph_context, store, false);
+       if (ret < 0) {
+         cerr << "unable to initialize zone: " << cpp_strerror(-ret) << std::endl;
+         return -ret;
+       }
+       ret = zone.create();
+       if (ret < 0) {
+         cerr << "failed to create zone " << zone_name << ": " << cpp_strerror(-ret) << std::endl;
+         return ret;
+       }
+       if (!zonegroup_id.empty() || !zonegroup_name.empty()) {
+         ret = zonegroup.add_zone(zone);
+         if (ret < 0) {
+           cerr << "failed to add zone " << zone_name << " to zonegroup " << zonegroup.get_name() << ": "
+                << cpp_strerror(-ret) << std::endl;
+           return ret;
+         }
+       }
        encode_json("zone", zone, formatter);
        formatter->flush(cout);
        cout << std::endl;

diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h
index 717ca6fdca6beee6cc1251bcd9bb535e913a2464..8ef9a5fbad092ba774cfa673a4ef722ea212f2cd 100644 (file)
--- a/src/rgw/rgw_rados.h
+++ b/src/rgw/rgw_rados.h
@@ -852,7 +852,7 @@ struct RGWZoneParams : RGWSystemMetaObj {
   map<string, RGWZonePlacementInfo> placement_pools;
 
   RGWZoneParams() : is_master(false) {}
-  RGWZoneParams(const string& name) : RGWSystemMetaObj(name), is_master(false) {}
+  RGWZoneParams(const string& name, bool _is_master = false) : RGWSystemMetaObj(name), is_master(_is_master) {}
   RGWZoneParams(const string& id, const string& name) : RGWSystemMetaObj(id, name), is_master(false) {}
 
   const string& get_pool_name(CephContext *cct);
@@ -863,7 +863,7 @@ struct RGWZoneParams : RGWSystemMetaObj {
 
   int init(CephContext *_cct, RGWRados *_store, RGWZoneGroup& zonegroup, bool setup_obj = true,
           bool old_format = false);
-
+  using RGWSystemMetaObj::init;
   void init_id(CephContext *cct, RGWZoneGroup& zonegroup);
   int create_default(bool old_format = false);