librbd : fix enable objectmap feature issue #6339
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
|
@dillaman , pls help review |
| @@ -1564,6 +1582,11 @@ int invoke_async_request(ImageCtx *ictx, const std::string& request_type, | |||
| lderr(cct) << "cannot enable object map" << dendl; | |||
| return -EINVAL; | |||
| } | |||
| if ((ictx->features & RBD_FEATURE_OBJECT_MAP) == 0) { | |||
There was a problem hiding this comment.
I would create the object map after the feature bits have been updated on disk (just in case the feature bit update fails). I would also create an object map for each existing snapshot to avoid similar "failed to load object map" errors when opening a snapshot.
| @@ -1575,13 +1605,6 @@ int invoke_async_request(ImageCtx *ictx, const std::string& request_type, | |||
| enable_flags |= RBD_FLAG_FAST_DIFF_INVALID; | |||
| features_mask |= (RBD_FEATURE_OBJECT_MAP | RBD_FEATURE_EXCLUSIVE_LOCK); | |||
| } | |||
|
|
|||
| if (enable_flags != 0) { | |||
| r = update_all_flags(ictx, enable_flags, enable_flags); | |||
There was a problem hiding this comment.
I wouldn't move this down -- we want to flag the object map as invalid before anyone gets a chance to use it.
Fixes: ceph#13558 Signed-off-by: xinxin shu <xinxin.shu@intel.com>
|
@dillaman , updated, help review |
|
lgtm |
dillaman
pushed a commit
that referenced
this pull request
Nov 5, 2015
librbd : fix enable objectmap feature issue Reviewed-by: Jason Dillaman <dillaman@redhat.com>
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.
Fixes: #13558
Signed-off-by: xinxin shu xinxin.shu@intel.com