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

Add option to serialize formatAndMount #1294

Merged
merged 1 commit into from
Jul 21, 2023

Conversation

mattcary
Copy link
Contributor

/kind bug

What this PR does / why we need it:

This a follow-on to #1168 and #1169. In addition to mkfs, we are now seeing reports from the field of fsck OOMing.

This change serializes formatAndMount in this driver. In parallel we will be extended mount-utils, and will remove this fix once the mount-utils release comes out (which releases every month or two).

Add option for serializing formatAndMount, including fsck as well as mkfs.

/asssign @saikat-royc

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jul 18, 2023
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 18, 2023
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 20, 2023
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 20, 2023
@mattcary mattcary force-pushed the fsck branch 2 times, most recently from 7dbce80 to 97182cc Compare July 20, 2023 21:09
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 20, 2023
@mattcary mattcary force-pushed the fsck branch 2 times, most recently from 40ab0b1 to 1d17763 Compare July 20, 2023 21:29
Change-Id: Ieff9b45a413c6df67d7199de6845132ff3b1cd2f
@saikat-royc
Copy link
Member

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 21, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mattcary, saikat-royc

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [mattcary,saikat-royc]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot merged commit 55ee1e2 into kubernetes-sigs:master Jul 21, 2023
@mattcary
Copy link
Contributor Author

/cherry-pick release-1.10

@k8s-infra-cherrypick-robot

@mattcary: new pull request created: #1310

In response to this:

/cherry-pick release-1.10

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/test-infra repository.

@mattcary
Copy link
Contributor Author

/cherry-pick release-1.9

@k8s-infra-cherrypick-robot

@mattcary: #1294 failed to apply on top of branch "release-1.9":

Applying: Add option to serialize formatAndMount
Using index info to reconstruct a base tree...
M	cmd/gce-pd-csi-driver/main.go
M	pkg/gce-pd-csi-driver/node.go
M	pkg/gce-pd-csi-driver/node_test.go
M	test/e2e/utils/utils.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/utils/utils.go
CONFLICT (content): Merge conflict in test/e2e/utils/utils.go
Auto-merging pkg/gce-pd-csi-driver/node_test.go
Auto-merging pkg/gce-pd-csi-driver/node.go
Auto-merging cmd/gce-pd-csi-driver/main.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add option to serialize formatAndMount
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.9

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/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants