New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

objclass: modify omap_get_{keys,vals} api #16667

Merged
merged 6 commits into from Jul 29, 2017

Conversation

Projects
None yet
3 participants
@tchaikov
Contributor

tchaikov commented Jul 29, 2017

No description provided.

yehudasa added some commits Jul 14, 2017

objclass: add 'more' param to omap listing
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
cls/*: adjust use of cls_cxx_map_get_vals()
Now that objclass call gets a new 'more' param.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
cls/lua: add 'more' param for cls_cxx_map_get_vals()
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
cls_{rbd, journal, lua}: adjust api
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
cls_kvs: adjust objclass api
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
librados_test_stub: use omap_get_vals2() and modify stubs
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Casey Bodley <cbodley@redhat.com>
@tchaikov

This comment has been minimized.

Contributor

tchaikov commented Jul 29, 2017

/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/cli/crushtool/build.t: failed
--- /home/jenkins-build/build/workspace/ceph-pull-requests/src/test/cli/crushtool/build.t
+++ /home/jenkins-build/build/workspace/ceph-pull-requests/src/test/cli/crushtool/build.t.err
@@ -14,12 +14,6 @@
 # display a warning if there is more than one root
 #
   $ crushtool --outfn "$map" --build --num_osds 5 node straw 2 rack straw 1 
-  .* The crush rulesets will use the root rack0 (re)
-  and ignore the others.
-  There are 3 roots, they can be
-  grouped into a single root by appending something like:
-    root straw 0
-  

the same old noise we have recently...

@tchaikov tchaikov added this to the luminous milestone Jul 29, 2017

@tchaikov

This comment has been minimized.

Contributor

tchaikov commented Jul 29, 2017

see #16352, since that PR has been tested by the rados qa suites. merging it.

@tchaikov tchaikov merged commit 4694cf4 into ceph:master Jul 29, 2017

3 of 4 checks passed

make check make check failed
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check (arm64) make check succeeded
Details

@tchaikov tchaikov deleted the tchaikov:wip-objclass-omap branch Jul 29, 2017

break;
last_read = raw_data.rbegin()->first;
if (max_return)
max_read = MIN(RBD_MAX_KEYS_READ, max_return - data.size());
} while (max_read);
} while (more);

This comment has been minimized.

@dillaman

dillaman Sep 5, 2017

Contributor

Note: since more is set to true when max_return is reached, this effectively breaks the functionality of max_return and instead returns all matching omap values. I opened tracker ticket 21247 to audit the remainder of the rbd cls methods to ensure max_return is being correctly honored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment