rgw: fix disabling Swift's object versioning through empty X-Versions-Location #13303
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
|
@rzarzynski : could you help to take a look? |
Jing-Scott
force-pushed
the
fix-swift-cannot-disable-object-versioning
branch
from
89ad8de
to
7e1834b
Compare
we should be able to disable object verioning by removing its X-Versions-Location metadata header by sending an empty key value. this description can be found at No.8 in http://docs.openstack.org/user-guide/cli-swift-set-object-versions.html. Fixes: http://tracker.ceph.com/issues/18852 Signed-off-by: Jing Wenjun <jingwenjun@cmss.chinamobile.com>
rzarzynski
requested changes
Feb 13, 2017
src/rgw/rgw_rest_swift.cc
Outdated
| /* If the Swift's versioning is globally disabled but someone wants to | ||
| * enable it for a given container, new version of Swift will generate | ||
| * the precondition failed error. */ | ||
| if (! s->cct->_conf->rgw_swift_versioning_enabled) { | ||
| return -ERR_PRECONDITION_FAILED; | ||
| } | ||
|
|
||
| swift_ver_location = std::move(vloc); | ||
| swift_ver_location = std::move(s->info.env->get("HTTP_X_VERSIONS_LOCATION", "")); |
There was a problem hiding this comment.
Hmm, I would say that std::move isn't necessary anymore. The method already returns a temporary.
There was a problem hiding this comment.
yup, you're right! I've updated it. Thanks!
Jing-Scott
force-pushed
the
fix-swift-cannot-disable-object-versioning
branch
from
7e1834b
to
17c5a0e
Compare
|
@Jing-Scott the thing Yehuda noted was that this change consults the headers map twice, and it could be done once; we'll update after merging |
rzarzynski
changed the title
|
Changed the pull request's name as it was confusing. We did support disabling the Swift's object versioning by sending |
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.
we should be able to disable object verioning by removing its X-Versions-Location metadata header by sending an empty key value. this description can be found at No.8 in http://docs.openstack.org/user-guide/cli-swift-set-object-versions.html.
Fixes: http://tracker.ceph.com/issues/18852
Signed-off-by: Jing Wenjun jingwenjun@cmss.chinamobile.com