From: Sage Weil <sage@redhat.com>
Date: Mon, 16 Jan 2017 20:17:03 +0000 (-0500)
Subject: ceph_test_rados: pass nullptr for pmore for omap fetch
X-Git-Tag: v12.0.0~121^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=faec324f646b0f9506d8ad5455d02c73ca33162d;p=ceph.git

ceph_test_rados: pass nullptr for pmore for omap fetch

Assume OSD limits are hugh enough.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/test/osd/RadosModel.h b/src/test/osd/RadosModel.h
index 5916bc5433a5..21eaaa046025 100644
--- a/src/test/osd/RadosModel.h
+++ b/src/test/osd/RadosModel.h
@@ -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);