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: client: trigger to flush the buffer when making snapshot #52499

Merged
merged 2 commits into from Aug 9, 2023
Merged

pacific: client: trigger to flush the buffer when making snapshot #52499

merged 2 commits into from Aug 9, 2023

Conversation

lxbsz
Copy link
Member

@lxbsz lxbsz commented Jul 18, 2023

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

backport of #51383
parent tracker: https://tracker.ceph.com/issues/59343

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
client: always add one new capsnap if Fb is used and Fw is not used
0e9f145 
If we set the 'writing' to 1 when the 'Fb' caps is used then later
if we have any dirty caps it will be skipped and will reuse the
existing capsnap, which is incorrect.

At the same time trigger to flush the buffer when making snapshot
and if the Fb is being used.

Fixes: https://tracker.ceph.com/issues/59343
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit 6262351)
@lxbsz
client: clean up the queue_cap_snap() code to remove unnecessary check
1d67198 
If the 'dirty' is true then 'dirty & CEPH_CAP_ANY_WR' will always be
true.

Fixes: https://tracker.ceph.com/issues/59343
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit cebb5a6)
@lxbsz lxbsz requested a review from a team July 18, 2023 02:30
@github-actions github-actions bot added the cephfs Ceph File System label Jul 18, 2023
@github-actions github-actions bot added this to the pacific milestone Jul 18, 2023
@vshankar
Copy link
Contributor

jenkins retest this please

vshankar
vshankar approved these changes Aug 8, 2023
View reviewed changes
Copy link
Contributor

@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.

https://tracker.ceph.com/projects/cephfs/wiki/Pacific#2023-August-8

@yuriw
Copy link
Contributor

yuriw commented Aug 8, 2023

jenkins test make check

@vshankar vshankar merged commit 9d1a31d into ceph:pacific Aug 9, 2023
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vshankar vshankar vshankar approved these changes

Assignees
No one assigned
Labels
cephfs Ceph File System needs-qa wip-yuri10-testing
Projects
None yet
Milestone
pacific
3 participants
@lxbsz @vshankar @yuriw