]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
radosgw-admin: allow 'sync group pipe modify' with existing user 60979/head
authorCasey Bodley <cbodley@redhat.com>
Mon, 21 Oct 2024 16:23:51 +0000 (12:23 -0400)
committerCasey Bodley <cbodley@redhat.com>
Fri, 6 Dec 2024 14:51:10 +0000 (09:51 -0500)
Fixes: https://tracker.ceph.com/issues/68645
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 64f252c24015df6e652601769cb6f6e5d4da10ca)

src/rgw/rgw_admin.cc

index 7bdd0544899ac3ea6a8fc03ebc10ab40e3933727..a0c0c46d439f56ac59e97ddbebd288e471182ff7 100644 (file)
@@ -10316,7 +10316,8 @@ next:
 
     if (!rgw::sal::User::empty(user)) {
       pipe->params.user = user->get_id();
-    } else if (pipe->params.mode == rgw_sync_pipe_params::MODE_USER) {
+    } else if (pipe->params.mode == rgw_sync_pipe_params::MODE_USER &&
+               pipe->params.user.empty()) {
       cerr << "ERROR: missing --uid for --mode=user" << std::endl;
       return EINVAL;
     }