From af6808f232bc88281923e6b32ba8a78359a56cc7 Mon Sep 17 00:00:00 2001 From: Yan Jun Date: Mon, 20 Jun 2016 14:55:19 +0800 Subject: [PATCH] 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 --- src/rgw/rgw_main.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc index ef8f7f762ae..3268f5d351b 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); -- 2.47.3