objectstore tool lookup by name & --op list filter #3020
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
|
@dzafman this will make it significantly easier to use ceph_objectstore_tool for tests (test_repair.py etc.) |
ghost
changed the title
|
repushed a version implementing what we discussed with one exception: I kept the object mapping because it turns out to be easy to keep. I changed it to return on error when there are multiple objects. I must confess that part of the reason for me to keep this is irrational (it is sometime difficult to let go of a piece of code ;-) and if you still think it would be better to remove it, I'll follow your advice. |
|
@dzafman added your changes and run in gitbuilder. Reviewed-by: from my point of view :-) |
Signed-off-by: Loic Dachary <ldachary@redhat.com>
Abstract out the PG exploration loops and encapsulate the list-lost and fix-lost semantic in a callable object. Signed-off-by: Loic Dachary <ldachary@redhat.com>
If the object is not a parsable JSON string, assume an object name and
look it up in all the PGs. If multiple objects have the same name, only
apply the command to one of them. It is primarily useful in a test
environment where the names of the tests objects are known and only a
small number of objects exists. It replaces the following:
path='--data-path dev/osd0 --journal-path dev/osd0.journal'
for pgid in $(./ceph_objectstore_tool $path --op list-pgs) ; do
object=$(./ceph_objectstore_tool $path --pgid $pgid --op list |
grep '"oid":"NAME"')
test -n "$object" && break
done
./ceph_objectstore_tool $path --pgid $pgid "$object" remove
with:
./ceph_objectstore_tool $path NAME remove
http://tracker.ceph.com/issues/10192 Fixes: #10192
Signed-off-by: Loic Dachary <ldachary@redhat.com>
The positional object name is used to filter the output of --op list and
only show the objects with a matching name. If both the object name and
the pgid are omitted, all objects from all PGs are displayed.
The output format is changed from
{"oid":"GROUP","key":"","snapid":-2,
"hash":2659194943,"max":0,"pool":0,"namespace":""}
to
[["0.7_head",{"oid":"GROUP","key":"","snapid":-2,
"hash":2659194943,"max":0,"pool":0,
"namespace":""}]]
where the first member is the pgid where the object is found.
Signed-off-by: Loic Dachary <ldachary@redhat.com>
The object format changed from
{json object}
to
[pgid,{json object}]
The parser is updated accordingly. If the --pgid is present, check that
it equals the pgid from the object description.
Signed-off-by: Loic Dachary <ldachary@redhat.com>
Signed-off-by: Loic Dachary <ldachary@redhat.com>
Signed-off-by: David Zafman <dzafman@redhat.com>
Instead of a parsable array make it easier to cut and paste listed objects Signed-off-by: David Zafman <dzafman@redhat.com>
Signed-off-by: David Zafman <dzafman@redhat.com>
…y output Signed-off-by: David Zafman <dzafman@redhat.com>
|
Reviewed-by: David Zafman dzafman@redhat.com |
--pretty-format defaults true Add --format so xml output can be requested --op list defaults to single line of json per object To override this more human readable output use --pretty-format=false Add testing of --op list special handling Signed-off-by: David Zafman <dzafman@redhat.com>
Signed-off-by: David Zafman <dzafman@redhat.com>
Signed-off-by: David Zafman <dzafman@redhat.com>
Signed-off-by: David Zafman <dzafman@redhat.com>
It isn't anticipated that anyone would use this but keeps backward compatible Signed-off-by: David Zafman <dzafman@redhat.com>
ghost
pushed a commit
that referenced
this pull request
Dec 5, 2014
objectstore tool lookup by name & --op list filter Reviewed-by: David Zafman <dzafman@redhat.com> Reviewed-by: Loic Dachary <ldachary@redhat.com>
ghost
merged commit
This pull request was closed.
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.
No description provided.