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

nautilus: mds: change how mds revoke stale caps #28583

Merged
merged 5 commits into from Aug 5, 2019

Conversation

@ukernel
Copy link
Member

commented Jun 17, 2019

https://tracker.ceph.com/issues/40326

  • References tracker ticket
  • Updates documentation if necessary
  • Includes tests for new functionality or reproducer for bug
@yuriw

This comment has been minimized.

Copy link
Contributor

commented Jun 17, 2019

@ukernel seems conflicting :

--- pr 28583 --- pulling https://github.com/ukernel/ceph.git branch nautilus-40326
remote: Enumerating objects: 31, done.
remote: Counting objects: 100% (31/31), done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 31 (delta 28), reused 28 (delta 28), pack-reused 0
Unpacking objects: 100% (31/31), done.
From https://github.com/ukernel/ceph

  • branch nautilus-40326 -> FETCH_HEAD
    Auto-merging src/mds/Server.cc
    Auto-merging src/mds/Locker.h
    Auto-merging src/mds/Locker.cc
    CONFLICT (content): Merge conflict in src/mds/Locker.cc
    Auto-merging src/common/options.cc
    Automatic merge failed; fix conflicts and then commit the result.
    Traceback (most recent call last):
    File "/home/yuriw/wip_master/src/script/build-integration-branch", line 62, in
    assert not r
    AssertionError
@yuriw

This comment has been minimized.

Copy link
Contributor

commented Jun 17, 2019

@batrick

This comment has been minimized.

Copy link
Member

commented Jun 19, 2019

marking DNM until Zheng verifies a test failure is unrelated

@batrick

This comment has been minimized.

Copy link
Member

commented Jun 19, 2019

Zheng verified this PR causes /ceph/teuthology-archive/yuriw-2019-06-18_03:14:43-fs-wip-yuri-testing-2019-06-18-0112-nautilus-distro-basic-smithi/4044919/teuthology.log

Delay merging this until a fix is ready.

@batrick

This comment has been minimized.

Copy link
Member

commented Jun 20, 2019

needs rebased too

rishabh-d-dave and others added 5 commits Oct 17, 2018
mds: don't mark unresponsive sessions holding no caps stale
When an unresponsive MDS session holds no caps, do not mark it stale
even after session_timeout; at session_autoclose, evict it directly.

Fixes: http://tracker.ceph.com/issues/17854
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 98af31d)
mds: change how mds revoke stale caps
- Only revokes conflicting caps from stale client.
- If stale client holds conflicting CEPH_CAP_ANY_WR,
  blacklist and kill it.

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

 Conflicts:
	src/mds/Locker.cc
	src/mds/Server.cc
qa/cephfs: update tests for stale session handling
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 1c8be58)
mds: remove the code that skip evicting the only client
There is already logic that defer marking unresponsive client stale.
No reason to defer evicting the only stale client.

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

 Conflicts:
	qa/tasks/cephfs/test_misc.py
mds: check last laggy before marking unresponsive client stale
Current mds may evict unresponsive client without going through session
stale. So we need to adjust the last laggy check.

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

@ukernel ukernel force-pushed the ukernel:nautilus-40326 branch from 017b16c to 44dd1f2 Jul 11, 2019

@smithfarm

This comment has been minimized.

Copy link
Contributor

commented Jul 24, 2019

Re-queuing for integration testing on the assumption this is fixed. Correct, @ukernel?

@ukernel

This comment has been minimized.

Copy link
Member Author

commented Jul 25, 2019

yes, it's fixed

@yuriw

This comment has been minimized.

Copy link
Contributor

commented Jul 30, 2019

@yuriw yuriw merged commit deee443 into ceph:nautilus Aug 5, 2019

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
Projects
None yet
6 participants
You can’t perform that action at this time.