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.

Sign up for GitHub

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

Jump to bottom

pacific: mds: fix deadlock between unlinking and linkmerge #53495

Merged
merged 6 commits into from Nov 15, 2023
Merged

pacific: mds: fix deadlock between unlinking and linkmerge #53495

merged 6 commits into from Nov 15, 2023

Conversation

lxbsz
Copy link
Member

@lxbsz lxbsz commented Sep 18, 2023

backport tracker: https://tracker.ceph.com/issues/62859

backport of #52199
parent tracker: https://tracker.ceph.com/issues/61818

Contribution Guidelines

Checklist

  • Tracker (select at least one)
    • References tracker ticket
    • Very recent bug; references commit where it was introduced
    • New feature (ticket optional)
    • Doc update (no ticket needed)
    • Code cleanup (no ticket needed)
  • Component impact
    • Affects Dashboard, opened tracker ticket
    • Affects Orchestrator, opened tracker ticket
    • No impact that needs to be tracked
  • Documentation (select at least one)
    • Updates relevant documentation
    • No doc update is appropriate
  • Tests (select at least one)
Show available Jenkins commands
  • jenkins retest this please
  • jenkins test classic perf
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test dashboard cephadm
  • jenkins test api
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox
  • jenkins test windows

@lxbsz
Revert "mds: wait the linkmerge/migrate to finish after unlink"
3b0e202 
This reverts commit 48f9a89.

Fixes: https://tracker.ceph.com/issues/61818
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit a9dd5df)
@lxbsz
Revert "mds: notify the waiters in replica MDSs"
0ac5729 
This reverts commit 478db14.

Fixes: https://tracker.ceph.com/issues/61818
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit 84c7da7)
@lxbsz
Revert "mds: wait reintegrate to finish when unlinking"
1a72cb4 
This reverts commit c3b3672.

Fixes: https://tracker.ceph.com/issues/61818
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit b0b279a)
@lxbsz
Revert "mds: clear the STATE_UNLINKING state when the unlink fails"
fd8f7c0 
This reverts commit 417f247.

Fixes: https://tracker.ceph.com/issues/61818
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit 4ec2b03)
@lxbsz
Revert "mds: wait unlink to finish to avoid conflict when creating sa…
cc4c79a 
…me dentries"

This reverts commit 76b099b.

Fixes: https://tracker.ceph.com/issues/61818
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit 8e24030)
Conflicts:
    src/messages/MDentryUnlink.h
@lxbsz
mds: continue linking if targeti is temporarily located in stray dir
e921cc4 
If one inode has more than one hardlink and after the primary dentry
is unlinked it will located the inode in the stray dir temporarily,
which is pending reintegration.

Just before the linkmerge/migrate is triggered a link request comes
it will fail with -EXDEV.

Just skip it and continue the linking.

Fixes: https://tracker.ceph.com/issues/56695
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit 5b9df82)
@lxbsz lxbsz requested a review from a team September 18, 2023 02:14
@lxbsz lxbsz requested a review from a team as a code owner September 18, 2023 02:14
@github-actions github-actions bot added cephfs Ceph File System core labels Sep 18, 2023
@github-actions github-actions bot added this to the pacific milestone Sep 18, 2023
@batrick batrick modified the milestones: pacific, v16.2.15 Nov 8, 2023
rishabh-d-dave
rishabh-d-dave reviewed Nov 14, 2023
View reviewed changes
Copy link
Contributor

@rishabh-d-dave rishabh-d-dave left a comment •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lxbsz Explanation for this commit hasn't been added - cc4c79a

@lxbsz
Copy link
Member Author

lxbsz commented Nov 15, 2023

@lxbsz Explanation for this commit hasn't been added - cc4c79a

This is just a backport PR and commits. We should add this in the upstream if needed. So let's keep the same with upstream.

rishabh-d-dave
rishabh-d-dave approved these changes Nov 15, 2023
View reviewed changes
Copy link
Contributor

@rishabh-d-dave rishabh-d-dave left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FS approved. QA run was successful - https://tracker.ceph.com/projects/cephfs/wiki/Pacific#15-Nov-2023

@yuriw yuriw merged commit 16552ac into ceph:pacific Nov 15, 2023
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rishabh-d-dave rishabh-d-dave rishabh-d-dave approved these changes

Assignees
No one assigned
Labels
cephfs Ceph File System core needs-qa wip-yuri7-testing
Projects
None yet
Milestone
v16.2.15
5 participants
@lxbsz @rishabh-d-dave @vshankar @batrick @yuriw