From 53de64122b206d11aa42fd401f88f02f2908e942 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Wed, 19 Feb 2014 10:27:14 -0800 Subject: [PATCH] radosgw-admin: don't generate access key if user exists Fixes: #6936 We want the user creation operation to be idempotent, so if user already exists don't generate a new access key. Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_admin.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index ac192aaa6c73..d1b7e961ff66 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -1356,7 +1356,9 @@ int main(int argc, char **argv) case OPT_USER_INFO: break; case OPT_USER_CREATE: - user_op.set_generate_key(); // generate a new key by default + if (!user_op.has_existing_user()) { + user_op.set_generate_key(); // generate a new key by default + } ret = user.add(user_op, &err_msg); if (ret < 0) { cerr << "could not create user: " << err_msg << std::endl; -- 2.47.3