From 8b1f036a25f394cfeb4398fe98f2463ff4f9230e Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Mon, 3 Oct 2016 14:05:08 -0400 Subject: [PATCH] rgw: filter out empty virtual bucket hostnames Signed-off-by: Casey Bodley (cherry picked from commit aa34b986b65bffb72659a31500c618f8c40308dc) --- src/rgw/rgw_rest.cc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc index 9344dd23f8dc6..623034810a124 100644 --- a/src/rgw/rgw_rest.cc +++ b/src/rgw/rgw_rest.cc @@ -205,10 +205,9 @@ void rgw_rest_init(CephContext *cct, RGWRados *store, RGWZoneGroup& zone_group) http_status_names[h->code] = h->name; } - if (!cct->_conf->rgw_dns_name.empty()) { - hostnames_set.insert(cct->_conf->rgw_dns_name); - } - hostnames_set.insert(zone_group.hostnames.begin(), zone_group.hostnames.end()); + hostnames_set.insert(cct->_conf->rgw_dns_name); + hostnames_set.insert(zone_group.hostnames.begin(), zone_group.hostnames.end()); + hostnames_set.erase(""); // filter out empty hostnames string s; ldout(cct, 20) << "RGW hostnames: " << std::accumulate(hostnames_set.begin(), hostnames_set.end(), s) << dendl; /* TODO: We should have a sanity check that no hostname matches the end of @@ -221,10 +220,9 @@ void rgw_rest_init(CephContext *cct, RGWRados *store, RGWZoneGroup& zone_group) * X.B.A ambigously splits to both {X, B.A} and {X.B, A} */ - if (!cct->_conf->rgw_dns_s3website_name.empty()) { - hostnames_s3website_set.insert(cct->_conf->rgw_dns_s3website_name); - } + hostnames_s3website_set.insert(cct->_conf->rgw_dns_s3website_name); hostnames_s3website_set.insert(zone_group.hostnames_s3website.begin(), zone_group.hostnames_s3website.end()); + hostnames_s3website_set.erase(""); // filter out empty hostnames s.clear(); ldout(cct, 20) << "RGW S3website hostnames: " << std::accumulate(hostnames_s3website_set.begin(), hostnames_s3website_set.end(), s) << dendl; /* TODO: we should repeat the hostnames_set sanity check here -- 2.39.5