]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: omap_get_all() fixes 12224/head
authorYehuda Sadeh <yehuda@redhat.com>
Mon, 28 Nov 2016 22:20:03 +0000 (14:20 -0800)
committerYehuda Sadeh <yehuda@redhat.com>
Tue, 29 Nov 2016 23:09:30 +0000 (15:09 -0800)
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
src/rgw/rgw_rados.cc

index b87c12ecaabd2d3cc312f0ed7208581c0461e56c..6b35247509cae77d8cbea03c9b2b3af04ff5d109 100644 (file)
@@ -11296,12 +11296,13 @@ int RGWRados::omap_get_all(rgw_obj& obj, bufferlist& header,
     return r;
   }
 
-  const int count = 1024;  // ?
+#define MAX_OMAP_GET_ENTRIES 1024
+  const int count = MAX_OMAP_GET_ENTRIES;
   string start_after;
 
   while (true) {
     std::map<string, bufferlist> t;
-    r = ref.ioctx.omap_get_vals(ref.oid, start_after, count, &m);
+    r = ref.ioctx.omap_get_vals(ref.oid, start_after, count, &t);
     if (r < 0) {
       return r;
     }