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

mgr,osd: ceph-mgr --help, unify usage text of other daemons #15176

merged 2 commits into from Jun 2, 2017


None yet
3 participants

tserong commented May 19, 2017

ceph-mgr --help did nothing before, now it prints something useful. I've also cleaned up the usage text of ceph-mon, ceph-mds and ceph-osd slightly to make everything more consistent.

tserong added some commits May 19, 2017

mgr: add generic --help output
Creating an MgrStandby in order to call its usage() method has
two problems:

1) MgrStandby wants to connect to a running cluster; if the
   cluster isn't up, you'll be left staring at a blinking cursor.
2) MgrStandby::usage() doesn't print anything anyway.

This commit takes pretty much the same approach to printing
usage information as, and

Signed-off-by: Tim Serong <>
osd/mon/mds: unify usage text, always use stdout
This unifies the first line of usage text: angle brackets
to indicate a mandatory option, and uppercase ID to match
the output from generic_server_usage().  It also ensures
ceph-mon prints all of its usage information to stdout,
same as the other daemons.

Signed-off-by: Tim Serong <>
<< " extract the monmap from the local monitor store and exit\n"
<< " --mon-data <directory>\n"
<< " where the mon store and keyring are located\n"
<< std::endl;

This comment has been minimized.


tchaikov May 19, 2017


why would we need a newline here?

This comment has been minimized.


tserong May 19, 2017


I did that because that's what was already in and I assume someone must have wanted a little visual separation between the daemon-specific options and the generic ones.

@tchaikov tchaikov changed the title from Fix ceph-mgr --help, unify usage text of other daemons to mgr,osd: ceph-mgr --help, unify usage text of other daemons May 19, 2017


This comment has been minimized.


liewegas commented May 19, 2017


@liewegas liewegas merged commit cd4acd8 into ceph:master Jun 2, 2017

3 checks passed

Signed-off-by all commits in this PR are signed
Unmodifed Submodules submodules for project are unmodified
default Build finished.

@tserong tserong deleted the SUSE:wip-mgr-fix-help branch Jun 2, 2017

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