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

mds: multimds flock fixes #15440

merged 5 commits into from Jun 15, 2017


None yet
2 participants

ukernel commented Jun 3, 2017

No description provided.

ukernel added some commits Jun 3, 2017

mds/flock: don't import ceph_lock_state_t::waiting_locks
Item in waiting_locks is associated with flock mds request in
exporter mds. If client re-sends the flock mds request to the
importer, the importer starts a new MDRequest. The new one's
'flock_was_waiting' is false.

Signed-off-by: "Yan, Zheng" <>
mds/flock: properly update ceph_lock_state_t::client_waiting_lock_counts
no item is added to waiting_locks when deadlock check fails

Signed-off-by: "Yan, Zheng" <>
mds/flock: properly remove item from global_waiting_locks
ceph_lock_state_t::remove_waiting() uses wrong key to search
global_waiting_locks. It should use item in waiting_locks as

Signed-off-by: "Yan, Zheng" <>

ukernel added some commits Jun 3, 2017

client: don't re-send interrupted flock request
don't re-send interrupted flock request in cases of mds failover
and receiving request forward.

Signed-off-by: "Yan, Zheng" <>
mds: fix Locker::calc_new_client_ranges()
update 'max_increased' when adding new client writable range

Signed-off-by: "Yan, Zheng" <>

jcsp approved these changes Jun 15, 2017

@jcsp jcsp merged commit 3d9a0a5 into ceph:master Jun 15, 2017

3 checks passed

Signed-off-by all commits in this PR are signed
Unmodifed Submodules submodules for project are unmodified
default Build finished.

@ukernel ukernel deleted the ukernel:wip-20170 branch Jun 26, 2017

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