Skip to content

cephfs-journal-tool: fix segfault during 'journal import' from invalid dump file#60726

Merged
vshankar merged 2 commits intoceph:mainfrom
joscollin:wip-B68928-fix-empty-file-read
Mar 4, 2025
Merged

cephfs-journal-tool: fix segfault during 'journal import' from invalid dump file#60726
vshankar merged 2 commits intoceph:mainfrom
joscollin:wip-B68928-fix-empty-file-read

Conversation

@joscollin
Copy link
Member

@joscollin joscollin commented Nov 13, 2024 •
edited
Loading

Fixes: https://tracker.ceph.com/issues/68928

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

@github-actions github-actions bot added the cephfs Ceph File System label Nov 13, 2024
@vshankar
Copy link
Contributor

vshankar commented Nov 13, 2024

Oh, importing a journal was blindly trusting that the dump would have the relevant headers. Ouch!

@joscollin
Copy link
Member Author

joscollin commented Nov 13, 2024

Oh, importing a journal was blindly trusting that the dump would have the relevant headers. Ouch!

Yes.

@joscollin joscollin force-pushed the wip-B68928-fix-empty-file-read branch from afe295a to f7f6d96 Compare November 14, 2024 03:19
@vshankar vshankar self-assigned this Nov 14, 2024
@vshankar vshankar requested a review from a team November 14, 2024 04:13
vshankar
vshankar reviewed Nov 14, 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.

LGTM. I think we can validate this via a test case? @joscollin

@joscollin
Copy link
Member Author

joscollin commented Nov 14, 2024

LGTM. I think we can validate this via a test case? @joscollin

I think we could write a test case for it. Do we already have a QA test for cephfs-journal-tool?

@joscollin
Copy link
Member Author

joscollin commented Nov 14, 2024

jenkins test submodules

@joscollin joscollin force-pushed the wip-B68928-fix-empty-file-read branch from f7f6d96 to 96c8834 Compare November 14, 2024 12:20
@github-actions github-actions bot added the tests label Nov 14, 2024
@vshankar
Copy link
Contributor

vshankar commented Nov 14, 2024

LGTM. I think we can validate this via a test case? @joscollin

I think we could write a test case for it. Do we already have a QA test for cephfs-journal-tool?

yes. guess you figured the respective test anyway 👍

@joscollin joscollin force-pushed the wip-B68928-fix-empty-file-read branch from 96c8834 to 95e2c83 Compare November 18, 2024 05:54
@joscollin
Copy link
Member Author

joscollin commented Nov 18, 2024

jenkins test make check

@joscollin
Copy link
Member Author

joscollin commented Nov 18, 2024

jenkins test submodules

@joscollin joscollin force-pushed the wip-B68928-fix-empty-file-read branch from 95e2c83 to f5f641a Compare November 19, 2024 04:38
@joscollin
Copy link
Member Author

joscollin commented Nov 19, 2024

rebased

joscollin
joscollin commented Nov 20, 2024
View reviewed changes
@joscollin joscollin force-pushed the wip-B68928-fix-empty-file-read branch from f5f641a to 3005b5f Compare November 21, 2024 09:41
dparmar18
dparmar18 reviewed Nov 21, 2024
View reviewed changes
dparmar18
dparmar18 reviewed Nov 21, 2024
View reviewed changes
@dparmar18 dparmar18 self-requested a review November 21, 2024 20:32
@dparmar18 dparmar18 self-assigned this Nov 21, 2024
@joscollin joscollin force-pushed the wip-B68928-fix-empty-file-read branch 2 times, most recently from 572ce21 to a69c2ba Compare November 25, 2024 06:06
joscollin
joscollin commented Nov 25, 2024
View reviewed changes
@joscollin joscollin marked this pull request as draft November 25, 2024 10:43
@ceph ceph deleted a comment from dparmar18 Nov 25, 2024
@joscollin
Copy link
Member Author

joscollin commented Nov 29, 2024

jenkins test api

@joscollin
Copy link
Member Author

joscollin commented Nov 29, 2024

jenkins test make check

@joscollin joscollin force-pushed the wip-B68928-fix-empty-file-read branch from 045d305 to aa3b704 Compare November 30, 2024 02:21
@joscollin
Copy link
Member Author

joscollin commented Dec 2, 2024

jenkins test api

@joscollin
Copy link
Member Author

joscollin commented Dec 2, 2024

@vshankar Could you please approve this, if there are no more comments?
Thx.

@vshankar
Copy link
Contributor

vshankar commented Dec 16, 2024

@vshankar Could you please approve this, if there are no more comments?

Was put for cephalocon. Back to work today. Will have a look.

vshankar
vshankar reviewed Jan 6, 2025
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.

Otherwise LGTM.

@joscollin joscollin force-pushed the wip-B68928-fix-empty-file-read branch from aa3b704 to 0320120 Compare January 9, 2025 05:25
vshankar
vshankar reviewed Jan 9, 2025
View reviewed changes
@joscollin joscollin force-pushed the wip-B68928-fix-empty-file-read branch from 0320120 to b262a12 Compare January 10, 2025 17:38
@joscollin joscollin force-pushed the wip-B68928-fix-empty-file-read branch from b262a12 to 2d45aa1 Compare January 13, 2025 04:22
@joscollin
Copy link
Member Author

joscollin commented Jan 13, 2025

@vshankar the review comments are addressed.

@joscollin joscollin requested a review from vshankar January 13, 2025 09:52
@joscollin
Copy link
Member Author

joscollin commented Jan 17, 2025

@vshankar ping

vshankar
vshankar reviewed Jan 21, 2025
View reviewed changes
vshankar
vshankar reviewed Jan 21, 2025
View reviewed changes
vshankar
vshankar reviewed Feb 3, 2025
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.

Otherwise LGTM.

@vshankar
Copy link
Contributor

vshankar commented Feb 13, 2025

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

vshankar
vshankar approved these changes Mar 4, 2025
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/Main#wip-vshankar-testing-20250227075314-debug

@vshankar vshankar merged commit b5ca6c1 into ceph:main Mar 4, 2025
@joscollin joscollin deleted the wip-B68928-fix-empty-file-read branch March 5, 2025 03:54
This was referenced Mar 5, 2025
Merged
Merged
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

@dparmar18 dparmar18 dparmar18 approved these changes

Assignees

@vshankar vshankar

@dparmar18 dparmar18

Labels

bug-fix cephfs Ceph File System needs-qa tests

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@joscollin @vshankar @dparmar18