From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 31 Mar 2020 14:46:33 +0000 (-0400)
Subject: rgw: pubsub sync module ignores ERR_USER_EXIST
X-Git-Tag: v15.2.2~41^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F34825%2Fhead;p=ceph.git

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 <cbodley@redhat.com>
(cherry picked from commit 768c9f3839c682cb3f92745396773faa96b18a9f)
---

diff --git a/src/rgw/rgw_sync_module_pubsub.cc b/src/rgw/rgw_sync_module_pubsub.cc
index 8d4b64935c07..d78bb29c76c5 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);
       }