New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cli: ceph: cli interactive mode does not understand quotes #4776

Merged
3 commits merged into from Jul 10, 2015

Conversation

Projects
None yet
3 participants
@tchaikov
Contributor

tchaikov commented May 27, 2015

tchaikov added some commits Apr 23, 2015

ceph.in: parse quote correctly in interactive mode
Fixes: #11279
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit bc7d8c9)
ceph.in: improve the interactive mode
* 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)
ceph.in: handle unknown Exception correctly
* in case parse_cmdargs() throws

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 7789eef)

@tchaikov tchaikov added this to the hammer milestone May 27, 2015

@ghost ghost changed the title from Wip 11279 hammer to ceph: cli interactive mode does not understand quotes Jun 7, 2015

@ghost ghost assigned theanalyst Jun 7, 2015

@theanalyst

This comment has been minimized.

Member

theanalyst commented Jul 6, 2015

@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?

@tchaikov

This comment has been minimized.

Contributor

tchaikov commented Jul 10, 2015

ghost pushed a commit that referenced this pull request Jul 10, 2015

Loic Dachary
Merge pull request #4776 from tchaikov/wip-11279-hammer
ceph: cli interactive mode does not understand quotes

Reviewed-by: Kefu Chai <kchai@redhat.com>

@ghost ghost merged commit f4d77c2 into ceph:hammer Jul 10, 2015

@ghost ghost changed the title from ceph: cli interactive mode does not understand quotes to cli: ceph: cli interactive mode does not understand quotes Aug 4, 2015

This issue was closed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment