]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: set a default data extra pool name 2073/head
authorYehuda Sadeh <yehuda@inktank.com>
Wed, 11 Jun 2014 23:50:41 +0000 (16:50 -0700)
committerSage Weil <sage@inktank.com>
Fri, 4 Jul 2014 05:19:57 +0000 (22:19 -0700)
Fixes: #8585
Have a default name for the data extra pool, otherwise it would be empty
which means that it'd default to the data pool name (which is a problem
with ec backends).

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
(cherry picked from commit b2542f8e880e45bb6d052f13eb3ef6a7c61e4cd4)

src/rgw/rgw_rados.cc

index cf6e06616b0b1ebf6549f0d0d417c53f951f6297..be8248e9f1b8b33f9235956d54f3ee7ecb1c666b 100644 (file)
@@ -54,6 +54,7 @@ static string *notify_oids = NULL;
 static string shadow_ns = "shadow";
 static string dir_oid_prefix = ".dir.";
 static string default_storage_pool = ".rgw.buckets";
+static string default_storage_extra_pool = ".rgw.buckets.extra";
 static string avail_pools = ".pools.avail";
 
 static string zone_info_oid_prefix = "zone_info.";
@@ -308,6 +309,7 @@ void RGWZoneParams::init_default(RGWRados *store)
     RGWZonePlacementInfo default_placement;
     default_placement.index_pool = ".rgw.buckets.index";
     default_placement.data_pool = ".rgw.buckets";
+    default_placement.data_extra_pool = ".rgw.buckets.extra";
     placement_pools["default-placement"] = default_placement;
   }
 }