]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: pubsub sync module ignores ERR_USER_EXIST 34322/head
authorCasey Bodley <cbodley@redhat.com>
Tue, 31 Mar 2020 14:46:33 +0000 (10:46 -0400)
committerCasey Bodley <cbodley@redhat.com>
Tue, 31 Mar 2020 20:49:43 +0000 (16:49 -0400)
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>
src/rgw/rgw_sync_module_pubsub.cc

index 8d4b64935c073729363454e27832d10b70e423f0..d78bb29c76c5c6167ad7fd6065eeb2d48798e745 100644 (file)
@@ -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);
       }