From: Casey Bodley <cbodley@users.noreply.github.com>
Date: Wed, 10 Jan 2018 16:39:21 +0000 (-0500)
Subject: Merge branch 'master' into wip-rgw-optimize-bucketLCPrepare
X-Git-Tag: v13.0.2~512^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=83ef5e9bfd28143c0f771a49f9bd2f604f95645a;p=ceph.git

Merge branch 'master' into wip-rgw-optimize-bucketLCPrepare
---

83ef5e9bfd28143c0f771a49f9bd2f604f95645a
diff --cc src/rgw/rgw_lc.cc
index f01e687a5bc6,3ac5813d93a5..da9552958b29
--- a/src/rgw/rgw_lc.cc
+++ b/src/rgw/rgw_lc.cc
@@@ -237,13 -237,11 +237,14 @@@ int RGWLC::bucket_lc_prepare(int index
        pair<string, int > entry(iter->first, lc_uninitial);
        ret = cls_rgw_lc_set_entry(store->lc_pool_ctx, obj_names[index],  entry);
        if (ret < 0) {
-         dout(0) << "RGWLC::bucket_lc_prepare() failed to set entry on " << obj_names[index] << dendl;
+         ldout(cct, 0) << "RGWLC::bucket_lc_prepare() failed to set entry on "
+             << obj_names[index] << dendl;
 -        break;
 +        return ret;
        }
 -      marker = iter->first;
 +    }
 +
 +    if (!entries.empty()) {
 +      marker = std::move(entries.rbegin()->first);
      }
    } while (!entries.empty());