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

os/bluestore/bluefs: Fix false collision with lockdep module #43589

Closed
wants to merge 1 commit into from

Conversation

aclamk
Copy link
Contributor

@aclamk aclamk commented Oct 19, 2021

Usually sequence of locking is

  1. FileWriter
  2. File.
    In _compact_log_async_LD_NF_D it was in reversed order.
    No real deadlock was possible, but lockdep complained.

Fixes: https://tracker.ceph.com/issues/52939
Signed-off-by: Adam Kupczyk akupczyk@redhat.com

Checklist

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

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

@aclamk aclamk requested review from cbodley and ifed01 October 19, 2021 12:46
@aclamk aclamk added the bug-fix label Oct 19, 2021
@aclamk aclamk requested review from neha-ojha and liewegas and removed request for liewegas October 19, 2021 12:47
@cbodley
Copy link
Contributor

cbodley commented Oct 19, 2021

thanks @aclamk. i ran the same test with this fix, and now it's failing with recursive lock of BlueFS::FileWriter::lock (168). i updated the tracker issue with more of the logs

@aclamk aclamk force-pushed the fix-bluefs-fine-grain-locks-52939 branch from 4b23ecf to e292475 Compare October 19, 2021 15:26
Usually sequence of locking is 1) FileWriter 2) File.
In _compact_log_async_LD_NF_D it was in reversed order.
No real deadlock was possible, but lockdep complained.

Bonus: Improved lock dependency graph.

Fixes: https://tracker.ceph.com/issues/52939
Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
@aclamk aclamk force-pushed the fix-bluefs-fine-grain-locks-52939 branch from e292475 to 21e5a0f Compare October 20, 2021 09:09
@aclamk
Copy link
Contributor Author

aclamk commented Oct 20, 2021

@cbodley Thanks for checking this so quickly.
Now revision 2.0.
I checked it now using ../qa/workunits/rgw/run-s3tests.sh

Copy link
Contributor

@cbodley cbodley left a comment

Choose a reason for hiding this comment

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

works for me, thanks!

@github-actions
Copy link

This pull request can no longer be automatically merged: a rebase is needed and changes have to be manually resolved

@yuriw
Copy link
Contributor

yuriw commented Oct 27, 2021

@aclamk pls rebase

@neha-ojha
Copy link
Member

@aclamk should we close this in favor of #43794?

@aclamk aclamk closed this Dec 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants