Merge pull request ceph#43915 from qiuxinyidian/dev-rgw

rgw: when radosgw-admin stating user, add user exists judging Reviewed-by: Casey Bodley <[email protected]> Reviewed-by: Daniel Gryniewicz <[email protected]>
mitsu-ko · Dec 8, 2021 · 4cdf6d4 · 4cdf6d4
2 parents 0e8ec96 + c1c4da3
commit 4cdf6d4
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/rgw/services/svc_user_rados.cc b/src/rgw/services/svc_user_rados.cc
@@ -910,9 +910,17 @@ int RGWSI_User_RADOS::read_stats(const DoutPrefixProvider *dpp,
 {
   string user_str = user.to_str();
 
+  RGWUserInfo info;
+  real_time mtime;
+  int ret = read_user_info(ctx, user, &info, nullptr, &mtime, nullptr, nullptr, null_yield, dpp);
+  if (ret < 0)
+  {
+    return ret;
+  }
+
   cls_user_header header;
   int r = cls_user_get_header(dpp, rgw_user(user_str), &header, y);
-  if (r < 0)
+  if (r < 0 && r != -ENOENT)
     return r;
 
   const cls_user_stats& hs = header.stats;