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.

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

rgw: fix upgrade from old multisite to new multisite configuration #10368

Merged
merged 1 commit into from
Jul 20, 2016

Conversation

oritwas
Copy link
Member

@oritwas oritwas commented Jul 20, 2016

We need to store the updated current period after adding the old converted regions

Fixes: http://tracker.ceph.com/issues/16751
Signed-off-by: Orit Wasserman owasserm@redhat.com

We need to store the updated current period after adding the old converted regions

Fixes: http://tracker.ceph.com/issues/16751
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
if (ret < 0) {
ldout(cct, 0) << "failed init zonegroup" << iter << ": ret "<< ret << " " << cpp_strerror(-ret) << dendl;
return ret;
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it possible to avoid reloading the zonegroup here? it doesn't look like delete_obj() really depends on this when old_format=true

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I moved the cleanup to the end so user can keep the old config in case of a failed conversion but it requires to reload the region.
We are deleting the old regions, the flag old_format has to be set otherwise we will delete the new zonegroups

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i understand the logic, and everything looks correct to me. i was just suggesting an optimization by skipping the step where we reload the zonegroup from rados. but optimizing the upgrade is probably wasted effort. :)

if you're satisfied with testing, i'm happy to merge 👍

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please do :)

@cbodley cbodley merged commit d21a3cd into ceph:master Jul 20, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants