radosgw-admin: fix for 'realm pull' #8404
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cbodley
force-pushed
the
wip-rgw-realm-pull-fix
branch
from
7cd1299
to
a25f266
Compare
|
@oritwas added a second commit that changes how |
| @@ -783,7 +783,7 @@ class RGWSystemMetaObj { | |||
| } | |||
| int init(CephContext *_cct, RGWRados *_store, bool setup_obj = true, bool old_format = false); | |||
| virtual int read_default_id(string& default_id, bool old_format = false); | |||
| virtual int set_as_default(); | |||
| virtual int set_as_default(bool exclusive); | |||
There was a problem hiding this comment.
Let set the default vaule to false , it will result in less code change
cbodley
force-pushed
the
wip-rgw-realm-pull-fix
branch
from
a25f266
to
9e2c988
Compare
this was causing failures in 'radosgw-admin realm pull': ERROR creating control for new realm realm0: (17) File exists 'realm pull' calls RGWRealm::create() with exclusive=false, but RGWRealm::create_control() was using exclusive=true Signed-off-by: Casey Bodley <cbodley@redhat.com>
this dodges the race in RGWRealm::create() and RGWZoneParams::create() that decides whether to set the new object as a default. by calling set_as_default() with exclusive=true, it will fail with EEXIST if a default is already set it also fixes an issue with 'realm pull' on a secondary zone, where a 'default' zone may be created but never actually set_as_default() Signed-off-by: Casey Bodley <cbodley@redhat.com>
cbodley
force-pushed
the
wip-rgw-realm-pull-fix
branch
from
9e2c988
to
280b8a1
Compare
| ldout(cct, 0) << "WARNING: failed to set realm as default realm, ret=" << ret << dendl; | ||
| } | ||
| // try to set as default. may race with another create, so pass exclusive=true | ||
| // so we don't override an existing default |
There was a problem hiding this comment.
@oritwas how does this look?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
this was causing teuthology failures in 'radosgw-admin realm pull':
ERROR creating control for new realm realm0: (17) File exists
'realm pull' calls RGWRealm::create() with exclusive=false, but RGWRealm::create_control() was using exclusive=true
Signed-off-by: Casey Bodley cbodley@redhat.com