cli: ceph: cli interactive mode does not understand quotes #4776
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
Fixes: ceph#11279 Signed-off-by: Kefu Chai <kchai@redhat.com> (cherry picked from commit bc7d8c9)
* 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> (cherry picked from commit da9d2b4)
* in case parse_cmdargs() throws Signed-off-by: Kefu Chai <kchai@redhat.com> (cherry picked from commit 7789eef)
ghost
mentioned this pull request
ghost
changed the title
|
@tchaikov this has passed the first run of integration tests as tracked at http://tracker.ceph.com/issues/11990 Do you think it is ready to merge? |
ghost
pushed a commit
that referenced
this pull request
Jul 10, 2015
ceph: cli interactive mode does not understand quotes Reviewed-by: Kefu Chai <kchai@redhat.com>
ghost
merged commit
ghost
changed the title
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.
http://tracker.ceph.com/issues/11736