Merged
Conversation
tchaikov
force-pushed
the
wip-interactive-ceph-cli
branch
from
a30919f to
7a0a5d2
Compare
Fixes: ceph#11279 Signed-off-by: Kefu Chai <kchai@redhat.com>
* if ceph is not reading from a tty, expect EOF instead of "quit" as the end of input. * do not panic at seeing the EOF * update the test case test_mon_injectargs_SI(). since we disables "ceph injectargs <args,...>" in a458bd8, in which the arguments of "injectargs" are supposed to be consumed by "tell" instead. so "ceph injectargs ..." is taken as an incomplete command, and this command will bring ceph cli into the interactive mode, redirecting its stdin to /dev/null helps ceph cli quit the loop, but in a way of throwing EOFError exception. this change handles the EOF, so the "ceph injectargs ..." does not throws anymore. but the side effect is that the test fails since it expects a non-zero return code. so replace it with an equivalent "tell" command which also fails but due to the non-SI postfix. Signed-off-by: Kefu Chai <kchai@redhat.com>
* in case parse_cmdargs() throws Signed-off-by: Kefu Chai <kchai@redhat.com>
tchaikov
force-pushed
the
wip-interactive-ceph-cli
branch
from
7a0a5d2 to
7789eef
Compare
ghost
self-assigned this
|
@tchaikov it looks great ! Because ceph.in is used intensively in various contexts, it would be good to run a set of qa tests, just to be sure. Reviewed-by: after a QA run |
Contributor
Author
|
@dachary thanks for the review ! |
Member
|
This looks sane to me too. |
Contributor
Author
|
@jecluis thank you for looking at this PR ! |
athanatos
pushed a commit
that referenced
this pull request
May 11, 2015
Wip interactive ceph cli Reviewed-by: Joao Eduardo Luis <joao@suse.de> Reviewed-by: Loic Dachary <ldachary@redhat.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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/11279
Fixes: #11279