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

Set the correct fsType for erofs when prefetching through the file list #299

Merged
merged 1 commit into from
Aug 28, 2024

Conversation

salvete
Copy link
Contributor

@salvete salvete commented Aug 20, 2024

What this PR does / why we need it:

When prefetching using the file list, the default fsType is ext4, even if the file system on the virtual block device is actually erofs. This sets the correct fsType based on the file system type present on the virtual block device.

The corresponding overlaybd PR:
containerd/overlaybd#344

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Please check the following list:

  • Does the affected code have corresponding tests, e.g. unit test, E2E test?
  • Does this change require a documentation update?
  • Does this introduce breaking changes that would require an announcement or bumping the major version?
  • Do all new files have an appropriate license header?

@liulanzheng liulanzheng added the ok-to-test Pull request is ok to run ci test label Aug 20, 2024
Copy link
Contributor

@hsiangkao hsiangkao left a comment

Choose a reason for hiding this comment

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

OverlayBDBlobFsType shouldn't be used for turboOCI due to multiple fsmeta cases.

When prefetching using the file list, the default fsType is ext4, even if
the file system on the virtual block device is actually erofs. This sets
the correct fsType based on the file system type present on the virtual block
device.

Signed-off-by: Hongzhen Luo <[email protected]>
@salvete salvete changed the title Add the fsType annotation when creating a turboOCI image. Set the correct fsType for erofs when prefetching through the file list Aug 21, 2024
@salvete
Copy link
Contributor Author

salvete commented Aug 21, 2024

OverlayBDBlobFsType shouldn't be used for turboOCI due to multiple fsmeta cases.

Done. Now for erofs, the fsType is determined by the superblock of the virtual block device.

@BigVan
Copy link
Member

BigVan commented Aug 21, 2024

LGTM

Copy link
Contributor

@WaberZhuang WaberZhuang left a comment

Choose a reason for hiding this comment

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

LGTM

@BigVan BigVan merged commit f2e9556 into containerd:main Aug 28, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ok-to-test Pull request is ok to run ci test
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants