From 768c9f3839c682cb3f92745396773faa96b18a9f Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 31 Mar 2020 10:46:33 -0400 Subject: [PATCH] rgw: pubsub sync module ignores ERR_USER_EXIST otherwise, this error gets returned by RGWPSDataSyncModule::start_sync() and data sync fails to start Fixes: https://tracker.ceph.com/issues/44857 Signed-off-by: Casey Bodley --- src/rgw/rgw_sync_module_pubsub.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rgw/rgw_sync_module_pubsub.cc b/src/rgw/rgw_sync_module_pubsub.cc index 8d4b64935c073..d78bb29c76c5c 100644 --- a/src/rgw/rgw_sync_module_pubsub.cc +++ b/src/rgw/rgw_sync_module_pubsub.cc @@ -1055,7 +1055,7 @@ public: create_user.display_name = "pubsub"; create_user.generate_key = false; yield call(new RGWUserCreateCR(sync_env->async_rados, sync_env->store, create_user, sync_env->dpp)); - if (retcode < 0) { + if (retcode < 0 && retcode != -ERR_USER_EXIST) { ldpp_dout(sync_env->dpp, 1) << "ERROR: failed to create rgw user: ret=" << retcode << dendl; return set_cr_error(retcode); } -- 2.39.5