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

mimic: mds: reset heartbeat during long-running loops in recovery #28918

Merged
merged 1 commit into from Jul 25, 2019

Conversation

@smithfarm
Copy link
Contributor

smithfarm commented Jul 8, 2019

Fixes: https://tracker.ceph.com/issues/40171
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit d90403c)

Conflicts:
	src/mds/Locker.h (trivial)
        src/mds/MDCache.cc (resolve by backporting relevant portion of
            4cf04ca as was done in the
            luminous backport)
@smithfarm smithfarm self-assigned this Jul 8, 2019
@smithfarm smithfarm added this to the mimic milestone Jul 8, 2019
@smithfarm smithfarm requested review from ukernel and batrick Jul 8, 2019
@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Jul 23, 2019

@yuriw yuriw merged commit 3f5fbd7 into ceph:mimic Jul 25, 2019
4 checks passed
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
@smithfarm smithfarm deleted the smithfarm:wip-40222-mimic branch Jul 25, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.