From: Yan Jun <yan.jun8@zte.com.cn>
Date: Mon, 20 Jun 2016 06:55:19 +0000 (+0800)
Subject: rgw: add error message for rgw_perf_start failure.
X-Git-Tag: v11.0.0~5^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=af6808f232bc88281923e6b32ba8a78359a56cc7;p=ceph.git

rgw: add error message for rgw_perf_start failure.

Maybe we should concern the error return code of
rgw_perf_start, althought it now returns zero only.

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
---

diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index ef8f7f762ae1..3268f5d351b4 100644
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -312,6 +312,10 @@ int main(int argc, const char **argv)
     return EIO;
   }
   r = rgw_perf_start(g_ceph_context);
+  if (r < 0) {
+    derr << "ERROR: failed starting rgw perf" << dendl;
+    return -r;
+  }
 
   rgw_rest_init(g_ceph_context, store, store->get_zonegroup());
 
@@ -320,9 +324,6 @@ int main(int argc, const char **argv)
   init_timer.shutdown();
   mutex.Unlock();
 
-  if (r) 
-    return 1;
-
   rgw_user_init(store);
   rgw_bucket_init(store->meta_mgr);
   rgw_log_usage_init(g_ceph_context, store);