]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph_test_rados: pass nullptr for pmore for omap fetch
authorSage Weil <sage@redhat.com>
Mon, 16 Jan 2017 20:17:03 +0000 (15:17 -0500)
committerSage Weil <sage@redhat.com>
Fri, 20 Jan 2017 22:52:18 +0000 (17:52 -0500)
Assume OSD limits are hugh enough.

Signed-off-by: Sage Weil <sage@redhat.com>
src/test/osd/RadosModel.h

index 5916bc5433a540cd55812e92aa18ce0e397bba79..21eaaa04602519f3bda40eae3666da20ffb24077 100644 (file)
@@ -1286,9 +1286,10 @@ public:
     }
     if (!context->no_omap) {
       op.omap_get_vals_by_keys(omap_requested_keys, &omap_returned_values, 0);
-
-      op.omap_get_keys("", -1, &omap_keys, 0);
-      op.omap_get_vals("", -1, &omap, 0);
+      // NOTE: we're ignore pmore here, which assumes the OSD limit is high
+      // enough for us.
+      op.omap_get_keys2("", -1, &omap_keys, nullptr, nullptr);
+      op.omap_get_vals2("", -1, &omap, nullptr, nullptr);
       op.omap_get_header(&header, 0);
     }
     op.getxattrs(&xattrs, 0);