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

mimic: mds: reset heartbeat map at potential time-consuming places #23506

Merged
merged 2 commits into from Oct 19, 2018

Conversation

Projects
None yet
6 participants
@ukernel
Copy link
Member

ukernel commented Aug 9, 2018

@ukernel ukernel added the cephfs label Aug 9, 2018

@tchaikov tchaikov added this to the mimic milestone Aug 9, 2018

@smithfarm smithfarm requested a review from batrick Aug 20, 2018

@smithfarm

This comment has been minimized.

Copy link
Contributor

smithfarm commented Aug 20, 2018

jenkins re-test this please

@smithfarm

This comment has been minimized.

Copy link
Contributor

smithfarm commented Aug 20, 2018

@batrick Please review (conflict resolution)

@smithfarm

This comment has been minimized.

Copy link
Contributor

smithfarm commented Aug 21, 2018

In file included from /home/jenkins-build/build/workspace/ceph-pull-requests/src/mds/Beacon.cc:25:0:
/home/jenkins-build/build/workspace/ceph-pull-requests/src/mds/MDSRank.h:308:30: error: 'MDSInternalContextBase::vec' has not been declared
     void queue_waiters_front(MDSInternalContextBase::vec& ls) {
                              ^~~~~~~~~~~~~~~~~~~~~~
/home/jenkins-build/build/workspace/ceph-pull-requests/src/mds/MDSRank.h: In member function 'void MDSRank::queue_waiters_front(int&)':
/home/jenkins-build/build/workspace/ceph-pull-requests/src/mds/MDSRank.h:309:55: error: no matching function for call to 'std::__cxx11::list<MDSInternalContextBase*>::splice(std::__cxx11::list<MDSInternalContextBase*>::iterator, int&)'
       finished_queue.splice(finished_queue.begin(), ls);
                                                       ^
In file included from /usr/include/c++/7/list:63:0,
                 from /home/jenkins-build/build/workspace/ceph-pull-requests/src/include/buffer.h:43,
                 from /home/jenkins-build/build/workspace/ceph-pull-requests/src/include/encoding.h:38,
                 from /home/jenkins-build/build/workspace/ceph-pull-requests/src/include/uuid.h:8,
                 from /home/jenkins-build/build/workspace/ceph-pull-requests/src/include/types.h:21,
                 from /home/jenkins-build/build/workspace/ceph-pull-requests/src/msg/msg_types.h:21,
                 from /home/jenkins-build/build/workspace/ceph-pull-requests/src/common/entity_name.h:20,
                 from /home/jenkins-build/build/workspace/ceph-pull-requests/src/common/config.h:21,
                 from /home/jenkins-build/build/workspace/ceph-pull-requests/src/common/dout.h:22,
                 from /home/jenkins-build/build/workspace/ceph-pull-requests/src/mds/Beacon.cc:16:
/usr/include/c++/7/bits/stl_list.h:1424:7: note: candidate: void std::__cxx11::list<_Tp, _Alloc>::splice(std::__cxx11::list<_Tp, _Alloc>::const_iterator, std::__cxx11::list<_Tp, _Alloc>&&) [with _Tp = MDSInternalContextBase*; _Alloc = std::allocator<MDSInternalContextBase*>; std::__cxx11::list<_Tp, _Alloc>::const_iterator = std::_List_const_iterator<MDSInternalContextBase*>]
       splice(const_iterator __position, list&& __x) noexcept
       ^~~~~~
/usr/include/c++/7/bits/stl_list.h:1424:7: note:   no known conversion for argument 2 from 'int' to 'std::__cxx11::list<MDSInternalContextBase*>&&'
...
...
...

ukernel added some commits Jul 11, 2018

mds: reset heartbeat map at potential time-consuming places
Signed-off-by: Yan, Zheng <zyan@redhat.com>
Fixes: http://tracker.ceph.com/issues/26858
(cherry picked from commit 5a6a9a3)

 Conflicts:
	src/mds/Migrator.cc
	src/mds/MDSRank.h
mds: consider max age of dispatch queue when finding stale client
session renew messages from clients can be in the dispatch queue,
waiting for getting dispatched.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 2ca5708)

@ukernel ukernel force-pushed the ukernel:mimic-26858 branch from 0eab4d6 to 438bf49 Sep 6, 2018

@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Oct 15, 2018

@yuriw yuriw merged commit ad74bec into ceph:mimic Oct 19, 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment