From: root <liu.peiyang@h3c.com>
Date: Wed, 6 Jan 2016 03:13:53 +0000 (+0800)
Subject: rgw:modify command stucking when operating radosgw-admin metadata list user
X-Git-Tag: v10.0.3~122^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F7032%2Fhead;p=ceph.git

rgw:modify command stucking when operating radosgw-admin metadata list user

When no user exists,the command stucks by operating radosgw-admin metadata list user. It seems all right now.

Signed-off-by: Peiyang Liu <liu.peiyang@h3c.com>
---

diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc
index 99c343b2f3a..b6d096b7cf7 100644
--- a/src/rgw/rgw_user.cc
+++ b/src/rgw/rgw_user.cc
@@ -2632,8 +2632,13 @@ public:
 
     int ret = store->list_raw_objects(store->zone.user_uid_pool, no_filter,
                                       max, info->ctx, unfiltered_keys, truncated);
-    if (ret < 0)
-      return ret;
+    if (ret < 0 && ret != -ENOENT)
+      return ret;		        
+    if (ret == -ENOENT) {
+      if (truncated)
+        *truncated = false;
+      return -ENOENT;
+    }
 
     // now filter out the buckets entries
     list<string>::iterator iter;