From: John Spray <jspray@redhat.com>
Date: Mon, 6 Jun 2016 09:47:29 +0000 (+0100)
Subject: Merge pull request #8598 from renhwsky/wip-renhw-ceph_mds-help
X-Git-Tag: v11.0.0~311
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=df407a72454480d356b653f5f70f34258498ff5b;p=ceph.git

Merge pull request #8598 from renhwsky/wip-renhw-ceph_mds-help

mds: fix usage() display

Reviewed-by: John Spray <john.spray@redhat.com>
---

df407a72454480d356b653f5f70f34258498ff5b
diff --cc src/ceph_mds.cc
index efe22e6b995f,1988acb1bd73..3c19b20ee90d
--- a/src/ceph_mds.cc
+++ b/src/ceph_mds.cc
@@@ -103,12 -107,30 +103,12 @@@ int main(int argc, const char **argv
        break;
      }
      else if (ceph_argparse_flag(args, i, "--help", "-h", (char*)NULL)) {
+       // exit(1) will be called in the usage()
        usage();
-       break;
      }
 -    else if (ceph_argparse_witharg(args, i, &val, "--journal-check", (char*)NULL)) {
 -      int r = parse_rank("journal-check", val);
 -      if (shadow != MDSMap::STATE_NULL) {
 -        dout(0) << "Error: can only select one standby state" << dendl;
 -        return -1;
 -      }
 -      dout(0) << "requesting oneshot_replay for mds." << r << dendl;
 -      shadow = MDSMap::STATE_ONESHOT_REPLAY;
 -      char rb[32];
 -      snprintf(rb, sizeof(rb), "%d", r);
 -      g_conf->set_val("mds_standby_for_rank", rb);
 -      g_conf->apply_changes(NULL);
 -    }
      else if (ceph_argparse_witharg(args, i, &val, "--hot-standby", (char*)NULL)) {
        int r = parse_rank("hot-standby", val);
 -      if (shadow != MDSMap::STATE_NULL) {
 -        dout(0) << "Error: can only select one standby state" << dendl;
 -        return -1;
 -      }
        dout(0) << "requesting standby_replay for mds." << r << dendl;
 -      shadow = MDSMap::STATE_STANDBY_REPLAY;
        char rb[32];
        snprintf(rb, sizeof(rb), "%d", r);
        g_conf->set_val("mds_standby_for_rank", rb);