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 15d46f47f90422fc3b807a4e337cb8dc56f06d33..6c5b7f1835f1634f41ae346354e7813ae0ed5bff 100644 (file)
--- 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 1a60f2e1a8351052252d1ba8e8d1f0760f181e41..df02434c4fbcc0e1daecd4352826cbec177b1bfa 100644 (file)
--- 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()