From faec324f646b0f9506d8ad5455d02c73ca33162d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 16 Jan 2017 15:17:03 -0500 Subject: [PATCH] ceph_test_rados: pass nullptr for pmore for omap fetch Assume OSD limits are hugh enough. Signed-off-by: Sage Weil --- src/test/osd/RadosModel.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/test/osd/RadosModel.h b/src/test/osd/RadosModel.h index 5916bc5433a..21eaaa04602 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);