Skip to content

move the device after the options when using mkfs.ext4#11362

Merged
estesp merged 1 commit intocontainerd:mainfrom
zouyee:move
Feb 19, 2025
Merged

move the device after the options when using mkfs.ext4#11362
estesp merged 1 commit intocontainerd:mainfrom
zouyee:move

Conversation

@zouyee
Copy link
Copy Markdown
Contributor

@zouyee zouyee commented Feb 8, 2025

fix: #11347

/cc @deitch

@k8s-ci-robot
Copy link
Copy Markdown

k8s-ci-robot commented Feb 8, 2025

@zouyee: GitHub didn't allow me to request PR reviews from the following users: deitch.

Note that only containerd members and repo collaborators can review this PR, and authors cannot review their own PRs.

Details

In response to this:

fix: #11347

/cc @deitch

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot
Copy link
Copy Markdown

k8s-ci-robot commented Feb 8, 2025

Hi @zouyee. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@dosubot dosubot Bot added the kind/bug label Feb 8, 2025
@zouyee
Copy link
Copy Markdown
Contributor Author

zouyee commented Feb 8, 2025 

==> default: Loading metadata for box 'almalinux/8'
    default: URL: https://vagrantcloud.com/api/v2/vagrant/almalinux/8
==> default: Adding box 'almalinux/8' (v8.10.202408[21](https://github.com/containerd/containerd/actions/runs/13213817428/job/36890739811?pr=11362#step:6:22)) for provider: libvirt (amd64)
    default: Downloading: https://vagrantcloud.com/almalinux/boxes/8/versions/8.10.20240821/providers/libvirt/amd64/vagrant.box

An error occurred while downloading the remote file. The error
message, if any, is reproduced below. Please fix this error and try
again.

deitch
deitch approved these changes Feb 8, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@deitch deitch left a comment

Choose a reason for hiding this comment

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

Thanks for addressing it.

djdongjin
djdongjin approved these changes Feb 8, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@djdongjin djdongjin 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 wonder why this is not captured in CI. Is that we never run this test in CI?

containerd/plugins/snapshots/devmapper/pool_device_test.go

Lines 101 to 103 in 59c8cf6

t.Run("MakeFileSystem", func(t *testing.T) {
testMakeFileSystem(t, pool)
})

btw, the CI failures are due to vagrant throttling: #11364

@AkihiroSuda AkihiroSuda added this pull request to the merge queue Feb 18, 2025
@AkihiroSuda AkihiroSuda added cherry-pick/1.6.x cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch cherry-pick/2.0.x Change to be cherry picked to release/2.0 branch labels Feb 18, 2025
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Feb 18, 2025
@AkihiroSuda AkihiroSuda added this pull request to the merge queue Feb 18, 2025
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Feb 18, 2025
@deitch
Copy link
Copy Markdown
Contributor

deitch commented Feb 19, 2025

It looks like it keeps getting removed from merge queue after being added?

@estesp estesp added this pull request to the merge queue Feb 19, 2025
Merged via the queue into containerd:main with commit e1da5de Feb 19, 2025
@deitch
Copy link
Copy Markdown
Contributor

deitch commented Feb 20, 2025

Great! Is this scheduled for a future patch version?

@AkihiroSuda
Copy link
Copy Markdown
Member

AkihiroSuda commented Feb 20, 2025

/cherry-pick release/2.0

@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

k8s-infra-cherrypick-robot commented Feb 20, 2025

@AkihiroSuda: new pull request created: #11411

Details

In response to this:

/cherry-pick release/2.0

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Feb 20, 2025
Merged
@deitch
Copy link
Copy Markdown
Contributor

deitch commented Feb 21, 2025

Does that mean it will make it into 2.0.3?

@AkihiroSuda AkihiroSuda added cherry-picked/2.0.x PR commits are cherry picked into the release/2.0 branch and removed cherry-pick/2.0.x Change to be cherry picked to release/2.0 branch labels Feb 21, 2025
@AkihiroSuda
Copy link
Copy Markdown
Member

AkihiroSuda commented Feb 21, 2025

Does that mean it will make it into 2.0.3?

Yes

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mxpv mxpv mxpv approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

@djdongjin djdongjin djdongjin approved these changes

+1 more reviewer

@deitch deitch deitch approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch cherry-picked/2.0.x PR commits are cherry picked into the release/2.0 branch kind/bug needs-ok-to-test size/XS

Projects

Pull Request Review
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

mkfs.ext4 has arguments in wrong order

8 participants

@zouyee @k8s-ci-robot @deitch @AkihiroSuda @k8s-infra-cherrypick-robot @mxpv @djdongjin @estesp