]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
test/librados_test_stub: fixed cls_cxx_map_get_keys/vals return value 16097/head
authorJason Dillaman <dillaman@redhat.com>
Wed, 12 Apr 2017 14:47:28 +0000 (10:47 -0400)
committerNathan Cutler <ncutler@suse.com>
Tue, 4 Jul 2017 08:54:42 +0000 (10:54 +0200)
Fixes: http://tracker.ceph.com/issues/19597
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 9ffd464dac102f684d6dfa78e58d2cb45e165ed6)

src/test/librados_test_stub/LibradosTestStub.cc

index 005c576bc8bd0121a14cb0a77bc997a071918dd8..59fd6f6810a95472f92c16ff77efb1d5215ebc3c 100644 (file)
@@ -1066,7 +1066,7 @@ int cls_cxx_map_get_keys(cls_method_context_t hctx, const string &start_obj,
       keys->insert(last_key);
     }
   } while (!vals.empty());
-  return 0;
+  return keys->size();
 }
 
 int cls_cxx_map_get_val(cls_method_context_t hctx, const string &key,
@@ -1094,8 +1094,12 @@ int cls_cxx_map_get_vals(cls_method_context_t hctx, const string &start_obj,
                          std::map<string, bufferlist> *vals) {
   librados::TestClassHandler::MethodContext *ctx =
     reinterpret_cast<librados::TestClassHandler::MethodContext*>(hctx);
-  return ctx->io_ctx_impl->omap_get_vals(ctx->oid, start_obj, filter_prefix,
-      max_to_get, vals);
+  int r = ctx->io_ctx_impl->omap_get_vals(ctx->oid, start_obj, filter_prefix,
+                                         max_to_get, vals);
+  if (r < 0) {
+    return r;
+  }
+  return vals->size();
 }
 
 int cls_cxx_map_remove_key(cls_method_context_t hctx, const string &key) {