Skip to content

quincy: cephfs-mirror: various fixes#56702

Merged
vshankar merged 7 commits intoceph:quincyfrom
joscollin:wip-65320-quincy
Oct 16, 2024
Merged

quincy: cephfs-mirror: various fixes#56702
vshankar merged 7 commits intoceph:quincyfrom
joscollin:wip-65320-quincy

Conversation

@joscollin
Copy link
Member

@joscollin joscollin commented Apr 4, 2024 •
edited
Loading

This backport PR includes fixes:

  • use monotonic clock
  • fix mirror daemon doesn't restart when blocklisted/failed
  • update peer status for invalid metadata in remote snapshot

These are backported together to avoid cherry-pick conflicts.

Fixes: https://tracker.ceph.com/issues/62265
Fixes: https://tracker.ceph.com/issues/66981
Fixes: https://tracker.ceph.com/issues/66978
Fixes: https://tracker.ceph.com/issues/66974
Fixes: https://tracker.ceph.com/issues/66971
Fixes: https://tracker.ceph.com/issues/67669
Fixes: https://tracker.ceph.com/issues/67672

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

@github-actions github-actions bot added the cephfs Ceph File System label Apr 4, 2024
@github-actions github-actions bot added this to the quincy milestone Apr 4, 2024
@joscollin joscollin requested a review from a team June 20, 2024 08:54
@joscollin
Copy link
Member Author

joscollin commented Jun 21, 2024

This PR is under test in https://tracker.ceph.com/issues/66597.

@joscollin joscollin changed the title quincy cephfs-mirror: use monotonic clock quincy: cephfs-mirror: use monotonic clock Jul 11, 2024
@github-actions github-actions bot added the tests label Jul 23, 2024
@joscollin
Copy link
Member Author

joscollin commented Jul 23, 2024

This PR is under test in https://tracker.ceph.com/issues/66597.

This need to be retested as more commits are cherry-picked to this PR.

@joscollin joscollin changed the title quincy: cephfs-mirror: use monotonic clock quincy: cephfs-mirror: use monotonic clock and fix mirror daemon doesn't restart when blocklisted/failed Jul 23, 2024
@lxbsz
Copy link
Member

lxbsz commented Jul 24, 2024

jenkins test make check

3 similar comments
@joscollin
Copy link
Member Author

joscollin commented Jul 24, 2024

jenkins test make check

@joscollin
Copy link
Member Author

joscollin commented Jul 24, 2024

jenkins test make check

@lxbsz
Copy link
Member

lxbsz commented Jul 26, 2024

jenkins test make check

@joscollin
Copy link
Member Author

joscollin commented Jul 26, 2024

Rebased

@lxbsz
Copy link
Member

lxbsz commented Aug 2, 2024

jenkins test make check

@lxbsz
Copy link
Member

lxbsz commented Aug 2, 2024

jenkins test api

1 similar comment
@joscollin
Copy link
Member Author

joscollin commented Aug 8, 2024

jenkins test api

@joscollin
Copy link
Member Author

joscollin commented Aug 8, 2024

jenkins test make check

@joscollin
cephfs-mirror: use monotonic clock
9483f0d 
Fixes: https://tracker.ceph.com/issues/62265
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit 7f0e7fe)

 Conflicts:
	src/tools/cephfs_mirror/Mirror.cc
        - resolved conflicts caused by 658ee6c not backported to quincy
@joscollin
cephfs_mirror: Add ErrorListener to maintain blocklisted/failed times…
065628e 
…tamp in FSMirror

Have FSMirror register a listener with InstanceWatcher/MirrorWatcher which would get invoked when the mirror daemon is blocklisted or failed.
Thus FSMirror can maintain the last blocklisted/failed timestamp and use that for restarting the mirror daemon.

Fixes: https://tracker.ceph.com/issues/64927
Fixes: https://tracker.ceph.com/issues/51964
Fixes: https://tracker.ceph.com/issues/63931
Fixes: https://tracker.ceph.com/issues/63089
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit 77ec7bf)
@joscollin
cephfs_mirror: Fixed negative seconds
f6dd471 
Fixes: https://tracker.ceph.com/issues/64927
Fixes: https://tracker.ceph.com/issues/51964
Fixes: https://tracker.ceph.com/issues/63931
Fixes: https://tracker.ceph.com/issues/63089
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit 96c3f8f)
@joscollin
qa: Wait for mirror daemon restart before getting new rados_inst
ff106f2 
After blocklisted/failed, wait for the mirror daemon restart
which is after 30 seconds timeout and then check for the new rados_inst.

Fixes: https://tracker.ceph.com/issues/64927
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit a9a5691)
@joscollin
cephfs_mirror: update peer status for invalid metadata in remote snap…
e09e60a 
…shot

Fixes: https://tracker.ceph.com/issues/65317
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit 8055255)
@joscollin
qa: add test_cephfs_mirror_remote_snap_corrupt_fails_synced_snapshot
ea3ef81 
Fixes: https://tracker.ceph.com/issues/65226
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit db65867)
@joscollin
doc: mention the peer status failed when snapshot created on the remo…
7543da1 
…te filesystem.

* Update the docs for the failed status, when the snapshot is created on the remote fs.
* Mention the read-only restrictions of the remote fs.

Fixes: https://tracker.ceph.com/issues/65317
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit ce10e5e)
@joscollin joscollin requested a review from a team as a code owner August 22, 2024 10:15
@joscollin
Copy link
Member Author

joscollin commented Aug 22, 2024

@rishabh-d-dave @lxbsz This PR should be QAed again as more commits are added to this PR.

@joscollin joscollin changed the title quincy: cephfs-mirror: use monotonic clock and fix mirror daemon doesn't restart when blocklisted/failed quincy: cephfs-mirror: various fixes Aug 22, 2024
@ceph ceph deleted a comment from anthonyeleven Aug 22, 2024
@joscollin
Copy link
Member Author

joscollin commented Aug 22, 2024

jenkins test api

vshankar
vshankar approved these changes Oct 16, 2024
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/Quincy#wip-xiubli-testing-20240812103236-quincy

@vshankar vshankar merged commit b81001c into ceph:quincy Oct 16, 2024
@joscollin joscollin deleted the wip-65320-quincy branch October 16, 2024 13:32
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 documentation needs-qa tests wip-yuri12-testing

Projects

None yet

Milestone

quincy

Development

Successfully merging this pull request may close these issues.

5 participants

@joscollin @lxbsz @vshankar @yuriw @rishabh-d-dave