From c08d4f160eb420a341eac8eb0843de6c403cfe38 Mon Sep 17 00:00:00 2001 From: Orit Wasserman Date: Wed, 7 Mar 2018 12:01:21 +0200 Subject: [PATCH] rgw: fix crash with rgw_run_sync_thread false Fixes: http://tracker.ceph.com/issues/20448 Signed-off-by: Orit Wasserman (cherry picked from commit f9395d63f8d7900a22f485d6d143021d0b92d8a0) --- src/rgw/rgw_main.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc index ecbf23a4161ad..0590a947ec231 100644 --- a/src/rgw/rgw_main.cc +++ b/src/rgw/rgw_main.cc @@ -186,7 +186,11 @@ static RGWRESTMgr *set_logging(RGWRESTMgr *mgr) static RGWRESTMgr *rest_filter(RGWRados *store, int dialect, RGWRESTMgr *orig) { RGWSyncModuleInstanceRef sync_module = store->get_sync_module(); - return sync_module->get_rest_filter(dialect, orig); + if (sync_module) { + return sync_module->get_rest_filter(dialect, orig); + } else { + return orig; + } } /* -- 2.39.5