Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

jewel: rgw: Unable to commit period zonegroup change #12315

Merged
merged 1 commit into from Feb 1, 2017
Merged

jewel: rgw: Unable to commit period zonegroup change #12315

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
39 changes: 34 additions & 5 deletions src/rgw/rgw_rados.cc
View file
Open in desktop
Expand Up @@ -3596,9 +3596,29 @@ int RGWRados::init_zg_from_period(bool *initialized)
// use endpoints from the zonegroup's master zone
auto master = zg.zones.find(zg.master_zone);
if (master == zg.zones.end()) {
ldout(cct, 0) << "zonegroup " << zg.get_name() << " missing zone for "
"master_zone=" << zg.master_zone << dendl;
return -EINVAL;
// fix missing master zone for a single zone zonegroup
if (zg.master_zone.empty() && zg.zones.size() == 1) {
master = zg.zones.begin();
ldout(cct, 0) << "zonegroup " << zg.get_name() << " missing master_zone, setting zone " <<
master->second.name << " id:" << master->second.id << " as master" << dendl;
if (zonegroup.get_id() == zg.get_id()) {
zonegroup.master_zone = master->second.id;
zonegroup.update();
} else {
RGWZoneGroup fixed_zg(zg.get_id(),zg.get_name());
ret = fixed_zg.init(cct, this);
if (ret < 0) {
ldout(cct, 0) << "error initializing zonegroup : " << cpp_strerror(-ret) << dendl;
return ret;
}
fixed_zg.master_zone = master->second.id;
fixed_zg.update();
}
} else {
ldout(cct, 0) << "zonegroup " << zg.get_name() << " missing zone for master_zone=" <<
zg.master_zone << dendl;
return -EINVAL;
}
}
const auto& endpoints = master->second.endpoints;
add_new_connection_to_map(zonegroup_conn_map, zg, new RGWRESTConn(cct, this, zg.get_id(), endpoints));
Expand Down Expand Up @@ -3640,9 +3660,18 @@ int RGWRados::init_zg_from_local(bool *creating_defaults)
// use endpoints from the zonegroup's master zone
auto master = zonegroup.zones.find(zonegroup.master_zone);
if (master == zonegroup.zones.end()) {
ldout(cct, 0) << "zonegroup " << zonegroup.get_name() << " missing zone for "
// fix missing master zone for a single zone zonegroup
if (zonegroup.master_zone.empty() && zonegroup.zones.size() == 1) {
master = zonegroup.zones.begin();
ldout(cct, 0) << "zonegroup " << zonegroup.get_name() << " missing master_zone, setting zone " <<
master->second.name << " id:" << master->second.id << " as master" << dendl;
zonegroup.master_zone = master->second.id;
zonegroup.update();
} else {
ldout(cct, 0) << "zonegroup " << zonegroup.get_name() << " missing zone for "
"master_zone=" << zonegroup.master_zone << dendl;
return -EINVAL;
return -EINVAL;
}
}
const auto& endpoints = master->second.endpoints;
rest_master_conn = new RGWRESTConn(cct, this, zonegroup.get_id(), endpoints);
Expand Down