From: Jiaying Ren <mikulely@gmail.com>
Date: Fri, 29 Jan 2016 08:29:01 +0000 (+0800)
Subject: ceph_osd.cc: fix unreachable flush call
X-Git-Tag: v10.0.4~109^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4ca6bfd43f030743ab2d89640e70afbcd3e8302c;p=ceph.git

ceph_osd.cc: fix unreachable flush call

The calling chain for generic_server_usage():

  generic_server_usage()
    ->generic_usage(true)
    ->exit(1)
  cout.flush()

any statements after generic_server_usage() would not be reached,so we
need to flush cout in generic_usage().

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
---

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index 15d46f47f904..6c5b7f1835f1 100644
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -90,7 +90,6 @@ void usage()
        << "                    get OSD fsid for the given block device\n"
        << std::endl;
   generic_server_usage();
-  cout.flush();
 }
 
 int preload_erasure_code()
diff --git a/src/common/ceph_argparse.cc b/src/common/ceph_argparse.cc
index 1a60f2e1a835..df02434c4fbc 100644
--- a/src/common/ceph_argparse.cc
+++ b/src/common/ceph_argparse.cc
@@ -533,6 +533,8 @@ static void generic_usage(bool is_server)
     cout << "\
   --debug_ms N      set message debug level (e.g. 1)\n";
   }
+
+  cout.flush();
 }
 
 void generic_server_usage()