diff -Nru ceph-15.2.11/debian/changelog ceph-15.2.11/debian/changelog --- ceph-15.2.11/debian/changelog 2021-03-26 09:42:57.000000000 +0000 +++ ceph-15.2.11/debian/changelog 2021-04-30 11:13:27.000000000 +0000 @@ -1,3 +1,10 @@ +ceph (15.2.11-0ubuntu0.20.04.2) focal; urgency=medium + + * d/p/bug1914584.patch: Drop as this patch does not fix the actual + issue. + + -- James Page Fri, 30 Apr 2021 12:13:27 +0100 + ceph (15.2.11-0ubuntu0.20.04.1) focal; urgency=medium [ James Page ] diff -Nru ceph-15.2.11/debian/patches/bug1914584.patch ceph-15.2.11/debian/patches/bug1914584.patch --- ceph-15.2.11/debian/patches/bug1914584.patch 2021-03-26 09:42:57.000000000 +0000 +++ ceph-15.2.11/debian/patches/bug1914584.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ -From 8762131e2960a69b93f20c0832d9c2fa1287d0bf Mon Sep 17 00:00:00 2001 -From: Matthew Vernon -Date: Thu, 4 Feb 2021 11:41:14 +0000 -Subject: [PATCH] rgw/radosgw-admin clarify error when email address already in - use - -The error message if you try and create an S3 user with an email -address that is already associated with another S3 account is very -confusing; this patch makes it much clearer - -To reproduce: - -radosgw-admin user create --uid=foo --display-name="Foo test" --email=bar@domain.invalid -radosgw-admin user create --uid=test --display-name="AN test" --email=bar@domain.invalid -could not create user: unable to parse parameters, user id mismatch, operation id: foo does not match: test - -With this patch: - -radosgw-admin user create --uid=test --display-name="AN test" --email=bar@domain.invalid -could not create user: unable to create user test because user id foo already exists with email bar@domain.invalid - -Fixes: https://tracker.ceph.com/issues/49137 -Fixes: https://tracker.ceph.com/issues/19411 -Signed-off-by: Matthew Vernon -(cherry picked from commit 05318d6f71e45a42a46518a0ef17047dfab83990) ---- - src/rgw/rgw_user.cc | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc -index b57987e2c1129..23ccb344580a5 100644 ---- a/src/rgw/rgw_user.cc -+++ b/src/rgw/rgw_user.cc -@@ -2096,7 +2096,14 @@ int RGWUser::modify(RGWUserAdminOpState& op_state, std::string *err_msg) - - ret = check_op(op_state, &subprocess_msg); - if (ret < 0) { -- set_err_msg(err_msg, "unable to parse parameters, " + subprocess_msg); -+ if (is_populated() && (user_id.compare(op_state.get_user_id()) != 0)) { -+ set_err_msg(err_msg, "unable to create user " + user_id.to_str() -+ + " because user id " + op_state.get_user_id().to_str() -+ + " already exists with email " -+ + op_state.get_user_email()); -+ } else { -+ set_err_msg(err_msg, "unable to parse parameters, " + subprocess_msg); -+ } - return ret; - } - diff -Nru ceph-15.2.11/debian/patches/series ceph-15.2.11/debian/patches/series --- ceph-15.2.11/debian/patches/series 2021-03-26 09:42:57.000000000 +0000 +++ ceph-15.2.11/debian/patches/series 2021-04-30 11:13:27.000000000 +0000 @@ -12,4 +12,3 @@ disable-log-slow-requests.patch # AARCH64 EC regression bug1917414.patch -bug1914584.patch diff -Nru ceph-15.2.11/src/test/debian-jessie/debian/changelog ceph-15.2.11/src/test/debian-jessie/debian/changelog --- ceph-15.2.11/src/test/debian-jessie/debian/changelog 2021-03-26 09:42:57.000000000 +0000 +++ ceph-15.2.11/src/test/debian-jessie/debian/changelog 2021-04-30 11:13:27.000000000 +0000 @@ -1,3 +1,10 @@ +ceph (15.2.11-0ubuntu0.20.04.2) focal; urgency=medium + + * d/p/bug1914584.patch: Drop as this patch does not fix the actual + issue. + + -- James Page Fri, 30 Apr 2021 12:13:27 +0100 + ceph (15.2.11-0ubuntu0.20.04.1) focal; urgency=medium [ James Page ] diff -Nru ceph-15.2.11/src/test/debian-jessie/debian/patches/bug1914584.patch ceph-15.2.11/src/test/debian-jessie/debian/patches/bug1914584.patch --- ceph-15.2.11/src/test/debian-jessie/debian/patches/bug1914584.patch 2021-03-26 09:42:57.000000000 +0000 +++ ceph-15.2.11/src/test/debian-jessie/debian/patches/bug1914584.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ -From 8762131e2960a69b93f20c0832d9c2fa1287d0bf Mon Sep 17 00:00:00 2001 -From: Matthew Vernon -Date: Thu, 4 Feb 2021 11:41:14 +0000 -Subject: [PATCH] rgw/radosgw-admin clarify error when email address already in - use - -The error message if you try and create an S3 user with an email -address that is already associated with another S3 account is very -confusing; this patch makes it much clearer - -To reproduce: - -radosgw-admin user create --uid=foo --display-name="Foo test" --email=bar@domain.invalid -radosgw-admin user create --uid=test --display-name="AN test" --email=bar@domain.invalid -could not create user: unable to parse parameters, user id mismatch, operation id: foo does not match: test - -With this patch: - -radosgw-admin user create --uid=test --display-name="AN test" --email=bar@domain.invalid -could not create user: unable to create user test because user id foo already exists with email bar@domain.invalid - -Fixes: https://tracker.ceph.com/issues/49137 -Fixes: https://tracker.ceph.com/issues/19411 -Signed-off-by: Matthew Vernon -(cherry picked from commit 05318d6f71e45a42a46518a0ef17047dfab83990) ---- - src/rgw/rgw_user.cc | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc -index b57987e2c1129..23ccb344580a5 100644 ---- a/src/rgw/rgw_user.cc -+++ b/src/rgw/rgw_user.cc -@@ -2096,7 +2096,14 @@ int RGWUser::modify(RGWUserAdminOpState& op_state, std::string *err_msg) - - ret = check_op(op_state, &subprocess_msg); - if (ret < 0) { -- set_err_msg(err_msg, "unable to parse parameters, " + subprocess_msg); -+ if (is_populated() && (user_id.compare(op_state.get_user_id()) != 0)) { -+ set_err_msg(err_msg, "unable to create user " + user_id.to_str() -+ + " because user id " + op_state.get_user_id().to_str() -+ + " already exists with email " -+ + op_state.get_user_email()); -+ } else { -+ set_err_msg(err_msg, "unable to parse parameters, " + subprocess_msg); -+ } - return ret; - } - diff -Nru ceph-15.2.11/src/test/debian-jessie/debian/patches/series ceph-15.2.11/src/test/debian-jessie/debian/patches/series --- ceph-15.2.11/src/test/debian-jessie/debian/patches/series 2021-03-26 09:42:57.000000000 +0000 +++ ceph-15.2.11/src/test/debian-jessie/debian/patches/series 2021-04-30 11:13:27.000000000 +0000 @@ -12,4 +12,3 @@ disable-log-slow-requests.patch # AARCH64 EC regression bug1917414.patch -bug1914584.patch diff -Nru ceph-15.2.11/src/test/ubuntu-16.04/debian/changelog ceph-15.2.11/src/test/ubuntu-16.04/debian/changelog --- ceph-15.2.11/src/test/ubuntu-16.04/debian/changelog 2021-03-26 09:42:57.000000000 +0000 +++ ceph-15.2.11/src/test/ubuntu-16.04/debian/changelog 2021-04-30 11:13:27.000000000 +0000 @@ -1,3 +1,10 @@ +ceph (15.2.11-0ubuntu0.20.04.2) focal; urgency=medium + + * d/p/bug1914584.patch: Drop as this patch does not fix the actual + issue. + + -- James Page Fri, 30 Apr 2021 12:13:27 +0100 + ceph (15.2.11-0ubuntu0.20.04.1) focal; urgency=medium [ James Page ] diff -Nru ceph-15.2.11/src/test/ubuntu-16.04/debian/patches/bug1914584.patch ceph-15.2.11/src/test/ubuntu-16.04/debian/patches/bug1914584.patch --- ceph-15.2.11/src/test/ubuntu-16.04/debian/patches/bug1914584.patch 2021-03-26 09:42:57.000000000 +0000 +++ ceph-15.2.11/src/test/ubuntu-16.04/debian/patches/bug1914584.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ -From 8762131e2960a69b93f20c0832d9c2fa1287d0bf Mon Sep 17 00:00:00 2001 -From: Matthew Vernon -Date: Thu, 4 Feb 2021 11:41:14 +0000 -Subject: [PATCH] rgw/radosgw-admin clarify error when email address already in - use - -The error message if you try and create an S3 user with an email -address that is already associated with another S3 account is very -confusing; this patch makes it much clearer - -To reproduce: - -radosgw-admin user create --uid=foo --display-name="Foo test" --email=bar@domain.invalid -radosgw-admin user create --uid=test --display-name="AN test" --email=bar@domain.invalid -could not create user: unable to parse parameters, user id mismatch, operation id: foo does not match: test - -With this patch: - -radosgw-admin user create --uid=test --display-name="AN test" --email=bar@domain.invalid -could not create user: unable to create user test because user id foo already exists with email bar@domain.invalid - -Fixes: https://tracker.ceph.com/issues/49137 -Fixes: https://tracker.ceph.com/issues/19411 -Signed-off-by: Matthew Vernon -(cherry picked from commit 05318d6f71e45a42a46518a0ef17047dfab83990) ---- - src/rgw/rgw_user.cc | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc -index b57987e2c1129..23ccb344580a5 100644 ---- a/src/rgw/rgw_user.cc -+++ b/src/rgw/rgw_user.cc -@@ -2096,7 +2096,14 @@ int RGWUser::modify(RGWUserAdminOpState& op_state, std::string *err_msg) - - ret = check_op(op_state, &subprocess_msg); - if (ret < 0) { -- set_err_msg(err_msg, "unable to parse parameters, " + subprocess_msg); -+ if (is_populated() && (user_id.compare(op_state.get_user_id()) != 0)) { -+ set_err_msg(err_msg, "unable to create user " + user_id.to_str() -+ + " because user id " + op_state.get_user_id().to_str() -+ + " already exists with email " -+ + op_state.get_user_email()); -+ } else { -+ set_err_msg(err_msg, "unable to parse parameters, " + subprocess_msg); -+ } - return ret; - } - diff -Nru ceph-15.2.11/src/test/ubuntu-16.04/debian/patches/series ceph-15.2.11/src/test/ubuntu-16.04/debian/patches/series --- ceph-15.2.11/src/test/ubuntu-16.04/debian/patches/series 2021-03-26 09:42:57.000000000 +0000 +++ ceph-15.2.11/src/test/ubuntu-16.04/debian/patches/series 2021-04-30 11:13:27.000000000 +0000 @@ -12,4 +12,3 @@ disable-log-slow-requests.patch # AARCH64 EC regression bug1917414.patch -bug1914584.patch diff -Nru ceph-15.2.11/src/test/ubuntu-18.04/debian/changelog ceph-15.2.11/src/test/ubuntu-18.04/debian/changelog --- ceph-15.2.11/src/test/ubuntu-18.04/debian/changelog 2021-03-26 09:42:57.000000000 +0000 +++ ceph-15.2.11/src/test/ubuntu-18.04/debian/changelog 2021-04-30 11:13:27.000000000 +0000 @@ -1,3 +1,10 @@ +ceph (15.2.11-0ubuntu0.20.04.2) focal; urgency=medium + + * d/p/bug1914584.patch: Drop as this patch does not fix the actual + issue. + + -- James Page Fri, 30 Apr 2021 12:13:27 +0100 + ceph (15.2.11-0ubuntu0.20.04.1) focal; urgency=medium [ James Page ] diff -Nru ceph-15.2.11/src/test/ubuntu-18.04/debian/patches/bug1914584.patch ceph-15.2.11/src/test/ubuntu-18.04/debian/patches/bug1914584.patch --- ceph-15.2.11/src/test/ubuntu-18.04/debian/patches/bug1914584.patch 2021-03-26 09:42:57.000000000 +0000 +++ ceph-15.2.11/src/test/ubuntu-18.04/debian/patches/bug1914584.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ -From 8762131e2960a69b93f20c0832d9c2fa1287d0bf Mon Sep 17 00:00:00 2001 -From: Matthew Vernon -Date: Thu, 4 Feb 2021 11:41:14 +0000 -Subject: [PATCH] rgw/radosgw-admin clarify error when email address already in - use - -The error message if you try and create an S3 user with an email -address that is already associated with another S3 account is very -confusing; this patch makes it much clearer - -To reproduce: - -radosgw-admin user create --uid=foo --display-name="Foo test" --email=bar@domain.invalid -radosgw-admin user create --uid=test --display-name="AN test" --email=bar@domain.invalid -could not create user: unable to parse parameters, user id mismatch, operation id: foo does not match: test - -With this patch: - -radosgw-admin user create --uid=test --display-name="AN test" --email=bar@domain.invalid -could not create user: unable to create user test because user id foo already exists with email bar@domain.invalid - -Fixes: https://tracker.ceph.com/issues/49137 -Fixes: https://tracker.ceph.com/issues/19411 -Signed-off-by: Matthew Vernon -(cherry picked from commit 05318d6f71e45a42a46518a0ef17047dfab83990) ---- - src/rgw/rgw_user.cc | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc -index b57987e2c1129..23ccb344580a5 100644 ---- a/src/rgw/rgw_user.cc -+++ b/src/rgw/rgw_user.cc -@@ -2096,7 +2096,14 @@ int RGWUser::modify(RGWUserAdminOpState& op_state, std::string *err_msg) - - ret = check_op(op_state, &subprocess_msg); - if (ret < 0) { -- set_err_msg(err_msg, "unable to parse parameters, " + subprocess_msg); -+ if (is_populated() && (user_id.compare(op_state.get_user_id()) != 0)) { -+ set_err_msg(err_msg, "unable to create user " + user_id.to_str() -+ + " because user id " + op_state.get_user_id().to_str() -+ + " already exists with email " -+ + op_state.get_user_email()); -+ } else { -+ set_err_msg(err_msg, "unable to parse parameters, " + subprocess_msg); -+ } - return ret; - } - diff -Nru ceph-15.2.11/src/test/ubuntu-18.04/debian/patches/series ceph-15.2.11/src/test/ubuntu-18.04/debian/patches/series --- ceph-15.2.11/src/test/ubuntu-18.04/debian/patches/series 2021-03-26 09:42:57.000000000 +0000 +++ ceph-15.2.11/src/test/ubuntu-18.04/debian/patches/series 2021-04-30 11:13:27.000000000 +0000 @@ -12,4 +12,3 @@ disable-log-slow-requests.patch # AARCH64 EC regression bug1917414.patch -bug1914584.patch