rgw: region conversion respects pre-existing rgw_region_root_pool

Fixes: http://tracker.ceph.com/issues/17963 Signed-off-by: Casey Bodley <cbodley@redhat.com>
ceph · Nov 18, 2016 · beb8839 · beb8839
1 parent 64bcf92
commit beb8839
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
@@ -271,6 +271,20 @@ int main(int argc, const char **argv)
     }
   }
 
+  // maintain existing region root pool for new multisite objects
+  if (!g_conf->rgw_region_root_pool.empty()) {
+    const char *root_pool = g_conf->rgw_region_root_pool.c_str();
+    if (g_conf->rgw_zonegroup_root_pool.empty()) {
+      g_conf->set_val_or_die("rgw_zonegroup_root_pool", root_pool);
+    }
+    if (g_conf->rgw_period_root_pool.empty()) {
+      g_conf->set_val_or_die("rgw_period_root_pool", root_pool);
+    }
+    if (g_conf->rgw_realm_root_pool.empty()) {
+      g_conf->set_val_or_die("rgw_realm_root_pool", root_pool);
+    }
+  }
+
   check_curl();
 
   if (g_conf->daemonize) {