From: Yehuda Sadeh <yehuda@redhat.com>
Date: Tue, 5 May 2015 00:02:29 +0000 (-0700)
Subject: rgw: orphan, fix truncated detection
X-Git-Tag: v0.94.4~49^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2e0f6fe98787e1f3ea7d107a814caadce7ee5f23;p=ceph.git

rgw: orphan, fix truncated detection

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit d8ce04db8542dae0027423f3c50355e5de74dc9a)
---

diff --git a/src/rgw/rgw_orphan.cc b/src/rgw/rgw_orphan.cc
index 7a23a040add3..d048cf6b7330 100644
--- a/src/rgw/rgw_orphan.cc
+++ b/src/rgw/rgw_orphan.cc
@@ -127,9 +127,13 @@ int RGWOrphanStore::store_entries(const string& oid, const map<string, bufferlis
   librados::ObjectWriteOperation op;
   op.omap_set(entries);
   cout << "storing " << entries.size() << " entries at " << oid << std::endl;
+  ldout(store->ctx(), 20) << "storing " << entries.size() << " entries at " << oid << ": " << dendl;
+  for (map<string, bufferlist>::const_iterator iter = entries.begin(); iter != entries.end(); ++iter) {
+    ldout(store->ctx(), 20) << " > " << iter->first << dendl;
+  }
   int ret = ioctx.operate(oid, &op);
   if (ret < 0) {
-    cerr << "ERROR: " << __func__ << "(" << oid << ") returned ret=" << ret << std::endl;
+    lderr(store->ctx()) << "ERROR: " << __func__ << "(" << oid << ") returned ret=" << ret << dendl;
   }
   
   return 0;
@@ -143,7 +147,7 @@ int RGWOrphanStore::read_entries(const string& oid, const string& marker, map<st
     cerr << "ERROR: " << __func__ << "(" << oid << ") returned ret=" << ret << std::endl;
   }
 
-  *truncated = (entries->size() < MAX_OMAP_GET);
+  *truncated = (entries->size() == MAX_OMAP_GET);
 
   return 0;
 }