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.

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

fix upgrate from hammer when zone doesn't have zoneparams #13900

Merged
merged 2 commits into from Mar 14, 2017

Conversation

Projects
None yet
3 participants
@oritwas
Contributor

oritwas commented Mar 9, 2017

@cbodley

the fix itself looks correct though 👍

@@ -3462,7 +3462,7 @@ int RGWRados::replace_region_with_zonegroup()
int ret = rgw_get_system_obj(this, obj_ctx, pool ,oid, bl, NULL, NULL);
if (ret < 0 && ret != -ENOENT) {
ldout(cct, 0) << "failed to read converted: ret "<< ret << " " << cpp_strerror(-ret)
ldout(cct, 0) << __func__ << "failed to read converted: ret "<< ret << " " << cpp_strerror(-ret)

This comment has been minimized.

@cbodley

cbodley Mar 9, 2017

Contributor

need to add a space, or this will print replace_region_with_zonegroupfailed to read converted: (same for the other changes below)

oritwas added some commits Mar 9, 2017

rgw: better debug information for upgrade
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
rgw: skip conversion of zones without any zoneparams
Fixes: http://tracker.ceph.com/issues/19231
Signed-off-by: Orit Wasserman <owasserm@redhat.com>

@tchaikov tchaikov added the rgw label Mar 10, 2017

@cbodley cbodley merged commit 849589d into ceph:master Mar 14, 2017

3 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodifed Submodules submodules for project are unmodified
Details
default Build finished.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment