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

fix: add closetimeo=0 option to fix data sync issue on Ubuntu 22.04 #1245

Merged
merged 1 commit into from
May 11, 2023

Conversation

andyzhangx
Copy link
Member

What type of PR is this?
/kind bug

What this PR does / why we need it:
fix: add closetimeo=0 option to fix data sync issue on Ubuntu 22.04

Which issue(s) this PR fixes:

Fixes #

Requirements:

Special notes for your reviewer:

Release note:

fix: add closetimeo=0 option to fix data sync issue on Ubuntu 22.04

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. kind/bug Categorizes issue or PR as related to a bug. labels May 10, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andyzhangx

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:

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 requested review from cvvz and gnufied May 10, 2023 14:14
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. 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 May 10, 2023
@andyzhangx
Copy link
Member Author

/retest

1 similar comment
@andyzhangx
Copy link
Member Author

/retest

@andyzhangx andyzhangx changed the title [WIP]fix: add closetimeo=0 option to fix data sync issue on Ubuntu 22.04 fix: add closetimeo=0 option to fix data sync issue on Ubuntu 22.04 May 11, 2023
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 11, 2023
@andyzhangx
Copy link
Member Author

/retest

@andyzhangx andyzhangx merged commit 009a968 into master May 11, 2023
@andyzhangx
Copy link
Member Author

/cherrypick release-1.26

@k8s-infra-cherrypick-robot

@andyzhangx: #1245 failed to apply on top of branch "release-1.26":

Applying: fix: add closetimeo=0 option to fix data sync issue on Ubuntu 22.04
Using index info to reconstruct a base tree...
M	pkg/azurefile/azurefile.go
M	pkg/azurefile/azurefile_test.go
M	pkg/azurefile/nodeserver.go
M	pkg/azurefileplugin/main.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/azurefileplugin/main.go
CONFLICT (content): Merge conflict in pkg/azurefileplugin/main.go
Auto-merging pkg/azurefile/nodeserver.go
Auto-merging pkg/azurefile/azurefile_test.go
Auto-merging pkg/azurefile/azurefile.go
CONFLICT (content): Merge conflict in pkg/azurefile/azurefile.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 fix: add closetimeo=0 option to fix data sync issue on Ubuntu 22.04
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:

/cherrypick release-1.26

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.

@andyzhangx
Copy link
Member Author

/cherrypick release-1.27

@k8s-infra-cherrypick-robot

@andyzhangx: cannot checkout release-1.27: error checking out release-1.27: exit status 1. output: error: pathspec 'release-1.27' did not match any file(s) known to git

In response to this:

/cherrypick release-1.27

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.

@andyzhangx
Copy link
Member Author

/cherrypick release-1.27

@k8s-infra-cherrypick-robot

@andyzhangx: new pull request created: #1249

In response to this:

/cherrypick release-1.27

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.

@andyzhangx andyzhangx deleted the appendClosetimeoOption branch May 15, 2023 01:22
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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants