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

UPSTREAM: google.golang.org/grpc: 1005: fix logical race in flow control #17735

Merged
merged 1 commit into from
Jan 24, 2018

Conversation

mfojtik
Copy link
Contributor

@mfojtik mfojtik commented Dec 12, 2017

No description provided.

@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 12, 2017
@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Dec 12, 2017
@openshift-merge-robot openshift-merge-robot added the vendor-update Touching vendor dir or related files label Dec 12, 2017
@mfojtik mfojtik requested review from smarterclayton and removed request for bparees December 12, 2017 19:30
@enj
Copy link
Contributor

enj commented Dec 12, 2017

@mfojtik you have an extra zero in the PR number: grpc/grpc-go#1005

@mfojtik mfojtik changed the title UPSTREAM: google.golang.org/grpc: 10005: fix logical race in flow control UPSTREAM: google.golang.org/grpc: 1005: fix logical race in flow control Dec 12, 2017
@mfojtik
Copy link
Contributor Author

mfojtik commented Dec 12, 2017

@enj thanks, fixed.

@mfojtik
Copy link
Contributor Author

mfojtik commented Dec 12, 2017

/cherrypick release-3.6
/cherrypick release-3.8

@openshift-cherrypick-robot

@mfojtik: once the present PR merges, I will cherry-pick it on top of release-3.6
in a new PR and assign it to you.

In response to this:

/cherrypick release-3.6
/cherrypick release-3.8

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.

@mfojtik
Copy link
Contributor Author

mfojtik commented Dec 12, 2017

/cherrypick release-3.8

@Kargakis does the bot don't recognize multiple cherrypick comments?

@openshift-cherrypick-robot

@mfojtik: once the present PR merges, I will cherry-pick it on top of release-3.8
in a new PR and assign it to you.

In response to this:

/cherrypick release-3.8

@Kargakis does the bot don't recognize multiple cherrypick comments?

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.

Copy link
Contributor

@soltysh soltysh left a comment

Choose a reason for hiding this comment

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

lgtm

@mfojtik
Copy link
Contributor Author

mfojtik commented Dec 13, 2017

/retest

@mfojtik
Copy link
Contributor Author

mfojtik commented Dec 13, 2017

/retest

@mfojtik
Copy link
Contributor Author

mfojtik commented Dec 18, 2017

@smarterclayton do we need/want this?

@tnozicka
Copy link
Contributor

/retest

@smarterclayton
Copy link
Contributor

Yes, I expect us to deliver this to 3.7. Have we had reproducer yet? It’s still happening on west-1

@soltysh
Copy link
Contributor

soltysh commented Dec 20, 2017

Yes, I expect us to deliver this to 3.7. Have we had reproducer yet? It’s still happening on west-1

No luck on the reproducer, I've tried several different approaches with this tweaking numbers in many different directions and was never able to reproduce it :/

@smarterclayton
Copy link
Contributor

smarterclayton commented Dec 31, 2017 via email

@mfojtik
Copy link
Contributor Author

mfojtik commented Jan 2, 2018

/retest

@smarterclayton if we can't reliably reproduce this in isolated environment, can we ship this and see if it helps? I'm 85% sure the queue is causing the API server being stuck and the tests in CI for this PR did not revealed any regression AFAIK.

@mfojtik
Copy link
Contributor Author

mfojtik commented Jan 16, 2018

@smarterclayton @derekwaynecarr merge?

@mfojtik
Copy link
Contributor Author

mfojtik commented Jan 16, 2018

@smarterclayton this should be automatically cherry-picked for 3.8... if not, it means we already have this fix and the grpc bumped.

@soltysh
Copy link
Contributor

soltysh commented Jan 17, 2018

Or the alternative #18071?

@soltysh
Copy link
Contributor

soltysh commented Jan 23, 2018

Discussed this with @mfojtik and @smarterclayton we're going with this
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 23, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mfojtik, soltysh

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

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@smarterclayton
Copy link
Contributor

smarterclayton commented Jan 24, 2018 via email

@soltysh
Copy link
Contributor

soltysh commented Jan 24, 2018

/retest

@openshift-merge-robot
Copy link
Contributor

/test all [submit-queue is verifying that this PR is safe to merge]

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue.

@openshift-cherrypick-robot

@openshift-merge-robot: new pull request created: #18270

In response to this:

Automatic merge from submit-queue.

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.

@openshift-cherrypick-robot

@openshift-merge-robot: #17735 failed to apply on top of branch "release-3.8":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	vendor/google.golang.org/grpc/transport/control.go
M	vendor/google.golang.org/grpc/transport/http2_client.go
M	vendor/google.golang.org/grpc/transport/http2_server.go
Falling back to patching base and 3-way merge...
Auto-merging vendor/google.golang.org/grpc/transport/http2_client.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/transport/http2_client.go
Patch failed at 0001 UPSTREAM: google.golang.org/grpc: 1005: fix logical race in flow control

In response to this:

Automatic merge from submit-queue.

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.

@mfojtik mfojtik deleted the grpc-picks-37 branch September 5, 2018 21:23
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. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. vendor-update Touching vendor dir or related files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants