Skip to content

Set TCP_USER_TIMEOUT socket option#967

Merged
openshift-merge-robot merged 4 commits intoopenshift:release-4.5from
p0lyn0mial:release-4.5-tcp-usr-timeout
Dec 9, 2020
Merged

Set TCP_USER_TIMEOUT socket option#967
openshift-merge-robot merged 4 commits intoopenshift:release-4.5from
p0lyn0mial:release-4.5-tcp-usr-timeout

Conversation

@p0lyn0mial
Copy link
Contributor

@p0lyn0mial p0lyn0mial commented Dec 9, 2020

clean pick of #926 and #944. I only removed klog/v2

@p0lyn0mial
provides DefaultClientDialer that returns a network dialer with defau…
9732143 
…lt options sets.
@p0lyn0mial
to DialContext
9548d30
@p0lyn0mial
improve DefaultClientDialContext
43d4141 
wrapping the DialContext method and setting the socket options on a copy of the file descriptor is not deterministic.
as per documentation attempting to change properties of the original using this duplicate
may or may not have the desired effect.

instead we should set the options on the original file descriptor.
@p0lyn0mial
go mod vendor
4c7d9c6
@openshift-ci-robot
Copy link

openshift-ci-robot commented Dec 9, 2020

@p0lyn0mial: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

Details

In response to this:

Set TCP_USER_TIMEOUT socket option

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.

@p0lyn0mial
Copy link
Contributor Author

p0lyn0mial commented Dec 9, 2020

/assign @sttts

@p0lyn0mial p0lyn0mial mentioned this pull request Dec 9, 2020
Merged
@sttts
Copy link
Contributor

sttts commented Dec 9, 2020

/lgtm
/approve

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 9, 2020
@openshift-ci-robot
Copy link

openshift-ci-robot commented Dec 9, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: p0lyn0mial, sttts

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

The pull request process is described here

Details 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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 9, 2020
@openshift-merge-robot openshift-merge-robot merged commit 07b0830 into openshift:release-4.5 Dec 9, 2020
This was referenced Dec 9, 2020
Merged
Merged
@p0lyn0mial
Copy link
Contributor Author

p0lyn0mial commented Jan 11, 2021

/cherry-pick release-4.4

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Jan 11, 2021

@p0lyn0mial: #967 failed to apply on top of branch "release-4.4":

Applying: provides DefaultClientDialer that returns a network dialer with default options sets.
Applying: to DialContext
Applying: improve DefaultClientDialContext
Applying: go mod vendor
Using index info to reconstruct a base tree...
M	go.mod
Falling back to patching base and 3-way merge...
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 go mod vendor
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".
Details

In response to this:

/cherry-pick release-4.4

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.

@p0lyn0mial p0lyn0mial mentioned this pull request Jan 11, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@deads2k deads2k Awaiting requested review from deads2k

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

Assignees

@sttts sttts

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@p0lyn0mial @openshift-ci-robot @sttts @openshift-cherrypick-robot @openshift-merge-robot