Skip to content

squid: mds: prevent duplicate wrlock acquisition for a single request#61840

Merged
yuriw merged 2 commits intoceph:squidfrom
vshankar:wip-69683
Apr 24, 2025
Merged

squid: mds: prevent duplicate wrlock acquisition for a single request#61840
yuriw merged 2 commits intoceph:squidfrom
vshankar:wip-69683

Conversation

@vshankar
Copy link
Contributor

@vshankar vshankar commented Feb 17, 2025

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

(not using ceph-backport.sh as the script misbehaves somehow in my repo -- will deal with it later)

Contribution Guidelines

  • To sign and title your commits, please refer to Submitting Patches to Ceph.

  • If you are submitting a fix for a stable branch (e.g. "quincy"), please refer to Submitting Patches to Ceph - Backports for the proper workflow.

  • When filling out the below checklist, you may click boxes directly in the GitHub web UI. When entering or editing the entire PR message in the GitHub web UI editor, you may also select a checklist item by adding an x between the brackets: [x]. Spaces and capitalization matter when checking off items this way.

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
  • jenkins test rook e2e

The lock cache is buggy and we need to disable it as a workaround.

Fixes: https://tracker.ceph.com/issues/65607
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit a86ee49)

Conflicts:
    src/mds/MDSRank.cc

Lack of 5c3dddf ("mds: add compile time checks for sortedness")
In case the current request has lock cache attached and then the
lock cache must have already acquired the wrlock of filelock. So
currently the path_traverse() will acquire the wrlock twice and
possibly caused deadlock by itself.

Fixes: https://tracker.ceph.com/issues/65607
Signed-off-by: Xiubo Li <xiubli@redhat.com>
Signed-off-by: Sunnatillo <sunnat.samadov@est.tech>
(cherry picked from commit 276b81a)

Conflicts:
    src/mds/MDSRank.cc

This commit moves around the config `mds_allow_async_dirops` in
the tracked keys which caused the conflict - avoid the move.
@vshankar vshankar added the cephfs Ceph File System label Feb 17, 2025
@vshankar vshankar requested a review from a team February 17, 2025 07:32
@github-actions github-actions bot added this to the squid milestone Feb 17, 2025
@kotreshhr
Copy link
Contributor

jenkins test make check

Copy link
Contributor Author

@vshankar vshankar left a comment

Choose a reason for hiding this comment

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

@vshankar
Copy link
Contributor Author

Reviewed-by: Venky Shankar vshankar@redhat.com

Copy link
Contributor

@yuriw yuriw left a comment

Choose a reason for hiding this comment

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

Reviewed-by: Venky Shankar vshankar@redhat.com

@yuriw yuriw merged commit b5134ef into ceph:squid Apr 24, 2025
15 of 16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants