]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: reset return code in when iterating over the bucket the objects 10555/head
authorOrit Wasserman <owasserm@redhat.com>
Thu, 25 Feb 2016 15:02:15 +0000 (16:02 +0100)
committerVicente Cheng <freeze.bilsted@gmail.com>
Wed, 3 Aug 2016 11:11:15 +0000 (19:11 +0800)
Fixes: #14826
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit e23fdcbbce47aaf041b9f8a0812c8a729aa5014b)

src/rgw/rgw_rados.cc

index 396d2d83f3524494c09768a80b5e2bd04377091c..3bc29a6ed45df4bf30a5ca5f925d0aa10aca82b3 100644 (file)
@@ -8170,6 +8170,7 @@ int RGWRados::cls_bucket_list(rgw_bucket& bucket, rgw_obj_key& start, const stri
   map<string, bufferlist> updates;
   uint32_t count = 0;
   while (count < num_entries && !candidates.empty()) {
+    r = 0;
     // Select the next one
     int pos = candidates.begin()->second;
     const string& name = vcurrents[pos]->first;