jewel: tools: Add export-remove ceph-objectstore-tool command option #21193
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
smithfarm
changed the title
smithfarm
changed the title
Signed-off-by: David Zafman <dzafman@redhat.com> (cherry picked from commit 49ca1ff) Conflicts: qa/standalone/special/ceph_objectstore_tool.py - file does not exist in jewel; backported the changes manually to src/test/ceph_objectstore_tool.py
Add new export-remove to combine the 2 operations Fixes: http://tracker.ceph.com/issues/21272 Signed-off-by: David Zafman <dzafman@redhat.com> (cherry picked from commit 3bb20f6) Conflicts: qa/standalone/special/ceph_objectstore_tool.py - file does not exist in jewel; backported changes manually to src/test/ceph_objectstore_tool.py qa/tasks/divergent_priors2.py - jewel uses pgid 1.0 qa/tasks/reg11184.py - jewel uses pgid 1.0 and lacks some of the code that is being changed src/tools/ceph_objectstore_tool.cc - jewel has slightly different list of subcommands
Signed-off-by: David Zafman <dzafman@redhat.com> (cherry picked from commit 5083287)
Fixes: http://tracker.ceph.com/issues/22086 Signed-off-by: David Zafman <dzafman@redhat.com> (cherry picked from commit a8b8d54) Conflicts: qa/standalone/special/ceph_objectstore_tool.py src/tools/ceph_objectstore_tool.cc src/tools/ceph_objectstore_tool.h
smithfarm
force-pushed
the
wip-21373-jewel
branch
from
8eeac27
to
e1c0a2b
Compare
|
@dzafman Please take another look - I cherry-picked the |
|
smithfarm
commented
Apr 3, 2018
src/tools/ceph_objectstore_tool.cc
Outdated
| formatter->flush(cout); | ||
|
|
||
| formatter->open_object_section("pg_missing_t"); | ||
| ms.missing.dump(formatter); |
There was a problem hiding this comment.
@dzafman The compilation failure happens here - metadata_section does not have a member missing. If you immediately see how to fix, please advise?
44cb6d3 introduced code to persist the missing set. That commit is too complicated to backport to jewel, so remove code that refers to the "missing" component of "metadata_section". Signed-off-by: Nathan Cutler <ncutler@suse.com>
|
merge conflict with #20882 and still doesn't pass make check |
dzafman
suggested changes
Apr 17, 2018
|
|
||
| # Remove the same pg that was exported | ||
| cmd = ((prefix + "--op remove --pgid 1.0"). | ||
| cmd = ((prefix + "--op export-remove --pgid 2.0 --file {file}"). |
|
Jewel is EOL |
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.
http://tracker.ceph.com/issues/21373
http://tracker.ceph.com/issues/22390