Skip to content
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

osd: bring in dmclock library changes #16755

Merged
merged 3 commits into from Aug 8, 2017

Conversation

ivancich
Copy link
Member

@ivancich ivancich commented Aug 2, 2017

Brings in recent dmclock changes. Modifies the interface to dmclock to use move semantics due to that corresponding change in the dmclock library.

@ivancich ivancich added the core label Aug 2, 2017
@ivancich ivancich requested a review from tchaikov August 2, 2017 13:25
@ivancich
Copy link
Member Author

ivancich commented Aug 2, 2017

@tchaikov I made the minimal change so it works with your move semantics changes to dmclock. Currently building to test.

@ivancich ivancich requested a review from jdurgin August 2, 2017 14:12
@ivancich
Copy link
Member Author

ivancich commented Aug 2, 2017

jenkins retest this please

3408cb8 Merge pull request ceph#33 from ceph/wip-move-make-options-up
f2099ec Moved the check for cmake's DO_NOT_DELAY_TAG_CALC to the top level, so it will affect how tests are built.
437b247 Merge pull request ceph#32 from ceph/wip_add_void_comments
18dd014 Add documentation as to why there are empty void references.
3ddfa39 Merge pull request ceph#28 from Yan-waller/wip-waller-0710dmclockgettime
57520df Merge pull request ceph#31 from dingdangzhang/master
4cad292 delete redundant break statement
b179f3b Merge pull request ceph#29 from tchaikov/wip-cmake
76d5f35 cmake: build gtest if not found
9896fef Merge pull request ceph#30 from tchaikov/wip-move
d72fac1 do FRIEND_TEST manually
f4b155d enforce move semantics of request types
8a2ad2a replace gettimeofday() with clock_gettime() function
b84ccf9 Merge pull request ceph#27 from ceph/joelin-master-ei
34a6e25 Set compiler flags at higher level CMakeLists.txt file, so they apply to sim and test, and so earlier versions of GCC know to use c++11 standard. Clean up cmake files in general.
bad581a Move the PrCtl data structure into a separate header file that can be included where needed in the future. Also, to avoid potential naming conflicts with ceph's PrCtl.h, prefix the filename with "dmc".
1b227bf Merge pull request ceph#25 from badone/wip-test_dmclock_server-coredump
ee1866e dmclock: Don't dump core when using EXPECT_DEATH_IF_SUPPORTED

git-subtree-dir: src/dmclock
git-subtree-split: 3408cb8f3c20d1956d8a08f15958627fbb60e733
…-new-dmclock-2

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
@ivancich
Copy link
Member Author

ivancich commented Aug 4, 2017

jenkins retest this please

1 similar comment
@ivancich
Copy link
Member Author

ivancich commented Aug 4, 2017

jenkins retest this please

@ivancich ivancich changed the title DNM osd: bring in dmclock library changes osd: bring in dmclock library changes Aug 7, 2017
@ivancich
Copy link
Member Author

ivancich commented Aug 7, 2017

@ivancich
Copy link
Member Author

ivancich commented Aug 7, 2017

@gregsfortytwo Would you be able to review this? Josh and Kefu both seem to be out. I realize you're very busy at the moment. Basically a number of changes have been make to the dmclock library and this brings them all in. One change Kefu make was to use move semantics when passing request objects around. And that required one small change in the ceph code to accommodate. I'd love for this to get in for luminous and Josh seemed to agree when we discussed it. Thanks!

@ivancich
Copy link
Member Author

ivancich commented Aug 7, 2017

@gregsfortytwo I should have added that I'm running it through teuthology and a broad rados test where only the two dmclock queues are selected for the op queue, and although it's not finished, the six failures seen so far don't seem to involve this code at all.

Copy link
Member

@gregsfortytwo gregsfortytwo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, the commits seem to do what they say on the tin and it didn't break everything in teuthology, so I guess it's good?
Note signed-off-by statements on squashed commits are still good, but not a big deal here.

@gregsfortytwo gregsfortytwo merged commit 25f1ede into ceph:master Aug 8, 2017
ivancich pushed a commit to ivancich/ceph-fork that referenced this pull request Aug 8, 2017
osd: bring in dmclock library changes

Reviewed-by:  J. Eric Ivancich <ivancich@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 25f1ede)
gregsfortytwo added a commit that referenced this pull request Aug 9, 2017
Merge pull request #16755 from ivancich/wip-pull-new-dmclock
@ivancich ivancich deleted the wip-pull-new-dmclock branch September 8, 2017 19:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
2 participants