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

luminous: mds: use monotonic clock for beacon message timekeeping #24311

Merged
merged 2 commits into from Oct 2, 2018

Conversation

Projects
None yet
3 participants
@batrick
Member

batrick commented Sep 27, 2018

@batrick batrick added the cephfs label Sep 27, 2018

@batrick batrick added this to the luminous milestone Sep 27, 2018

@batrick batrick force-pushed the batrick:i35838 branch from 760ce8e to 2704d51 Sep 27, 2018

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Sep 28, 2018

In file included from /home/jenkins-build/build/workspace/ceph-pull-requests/src/mds/MDSDaemon.h:28:0,
                 from /home/jenkins-build/build/workspace/ceph-pull-requests/src/mds/MDSDaemon.cc:42:
/home/jenkins-build/build/workspace/ceph-pull-requests/src/mds/Beacon.h:110:27: error: could not convert ‘std::chrono::time_point<_Clock, _Dur>::min<ceph::time_detail::coarse_mono_clock, std::chrono::duration<long unsigned int, std::ratio<1l, 1000000000l> > >’ from ‘std::chrono::time_point<ceph::time_detail::coarse_mono_clock> (*)()’ to ‘Beacon::time {aka std::chrono::time_point<ceph::time_detail::coarse_mono_clock>}’
   time last_laggy = time::min;
                           ^

@batrick batrick force-pushed the batrick:i35838 branch 2 times, most recently from 7c0ee4d to 4d0833a Sep 28, 2018

@yuriw

This comment has been minimized.

Contributor

yuriw commented Sep 28, 2018

batrick added some commits Aug 17, 2018

mds: simplify beacon init
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit b7448f8)

Conflicts:
	src/mds/Beacon.cc
	src/mds/Beacon.h
mds: use monotonic clock in beacon
Also update other parts of MDS which interact.

Fixes: http://tracker.ceph.com/issues/26959

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit e77a2f5)

Conflicts:
	src/mds/Beacon.cc
	src/mds/Beacon.h
	src/mds/MDCache.h
	src/mds/Server.cc

@batrick batrick force-pushed the batrick:i35838 branch from 4d0833a to a2f3f5f Oct 1, 2018

@yuriw

This comment has been minimized.

Contributor

yuriw commented Oct 1, 2018

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Oct 2, 2018

@batrick Would it make sense to do #24375 in this PR instead of separately?

@batrick

This comment has been minimized.

Member

batrick commented Oct 2, 2018

@smithfarm since this already passes QA, let's just merge this now and rebase the other

@batrick

This comment has been minimized.

Member

batrick commented Oct 2, 2018

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

@yuriw

yuriw approved these changes Oct 2, 2018

Reviewed-by: Patrick Donnelly pdonnell@redhat.com

@yuriw yuriw merged commit 8ffd549 into ceph:luminous Oct 2, 2018

4 checks passed

Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details

@batrick batrick deleted the batrick:i35838 branch Oct 5, 2018

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