From 3ef99416843c9b6e1a0dba9e41a023face524a60 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 6 Jan 2016 11:13:53 +0800 Subject: [PATCH] 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 --- src/rgw/rgw_user.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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::iterator iter; -- 2.47.3