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

alts: Forward-fix of ALTS queuing of handshake requests. #6906

Merged
merged 2 commits into from
Jan 11, 2024

Conversation

matthewstevenson88
Copy link
Contributor

This PR builds on #6884, which was reverted in #6903 because of flakiness in alts_test.go. It turned out that this flakiness was just due to the test occasionally bumping up on the timeout, so we've fixed this in this PR by increasing the timeout.

RELEASE NOTES: none

@matthewstevenson88 matthewstevenson88 added the Type: Feature New features or improvements in behavior label Jan 2, 2024
@matthewstevenson88 matthewstevenson88 added this to the 1.61 Release milestone Jan 2, 2024
@matthewstevenson88 matthewstevenson88 self-assigned this Jan 2, 2024
Copy link

codecov bot commented Jan 2, 2024

Codecov Report

Merging #6906 (c103835) into master (71cc0f1) will increase coverage by 0.00%.
Report is 5 commits behind head on master.
The diff coverage is 50.00%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #6906   +/-   ##
=======================================
  Coverage   83.69%   83.70%           
=======================================
  Files         286      287    +1     
  Lines       30756    30832   +76     
=======================================
+ Hits        25742    25807   +65     
- Misses       3956     3971   +15     
+ Partials     1058     1054    -4     
Files Coverage Δ
credentials/alts/internal/handshaker/handshaker.go 77.31% <50.00%> (+3.09%) ⬆️

... and 27 files with indirect coverage changes

@matthewstevenson88 matthewstevenson88 added the Type: Security A bug or other problem affecting security label Jan 2, 2024
@matthewstevenson88 matthewstevenson88 marked this pull request as ready for review January 2, 2024 20:21
@ginayeh ginayeh requested review from erm-g and removed request for easwars January 3, 2024 18:06
@ginayeh
Copy link
Contributor

ginayeh commented Jan 3, 2024

@erm-g can you review this PR first?

@matthewstevenson88
Copy link
Contributor Author

Note that the real changes were already reviewed in #6884, the only delta here is bumping up the test timeout in alts_test.go.

@matthewstevenson88
Copy link
Contributor Author

@erm-g Friendly ping.

Also cc @cesarghali.

@@ -44,7 +44,7 @@ import (
)

const (
defaultTestLongTimeout = 10 * time.Second
defaultTestLongTimeout = 60 * time.Second
Copy link
Contributor

@erm-g erm-g Jan 10, 2024

Choose a reason for hiding this comment

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

I'm not sure I fully understand this long timeout. It's used only for establishAltsConnection and has the comment
// The server is not ready yet. Try again.
However the server should be up and running because of synchronous startServer call preceding the `establishAltsConnection'. What am I missing here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That comment was just a bit out-of-date. I've updated it to better reflect the current state of affairs. Thanks for flagging this!

@dfawley dfawley assigned erm-g and unassigned matthewstevenson88 Jan 10, 2024
@erm-g erm-g merged commit 953d12a into grpc:master Jan 11, 2024
13 of 14 checks passed
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 10, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Type: Feature New features or improvements in behavior Type: Security A bug or other problem affecting security
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants