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

ringhash: more e2e tests from c-core #7334

Merged
merged 8 commits into from
Jul 17, 2024
Merged

Conversation

atollena
Copy link
Collaborator

@atollena atollena commented Jun 19, 2024

Follow up to #7271 to fix #6072.

This adds a dozen more end to end tests.

There are tests that I did not port, specifically:

I will follow up with fixes for each one of the remaining tests.

RELEASE NOTES: none

@atollena atollena added this to the 1.66 Release milestone Jun 19, 2024
@atollena atollena requested a review from easwars June 19, 2024 10:31
@atollena atollena force-pushed the issue-6072-part-2 branch from 8dafccc to d6d26a5 Compare June 19, 2024 10:35
Copy link

codecov bot commented Jun 19, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 81.58%. Comparing base (b1979b6) to head (0be8a86).

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #7334      +/-   ##
==========================================
+ Coverage   81.50%   81.58%   +0.07%     
==========================================
  Files         350      350              
  Lines       26846    26877      +31     
==========================================
+ Hits        21882    21928      +46     
+ Misses       3778     3761      -17     
- Partials     1186     1188       +2     
Files Coverage Δ
internal/testutils/blocking_context_dialer.go 100.00% <100.00%> (+16.66%) ⬆️

... and 11 files with indirect coverage changes

Follow up to grpc#7271 to fix
grpc#6072.

This adds a dozen more end to end tests.

There are tests that I did not port, specifically:

- TestRingHash_TransientFailureSkipToAvailableReady was flaky when I ported it,
so I removed it while investigating.

- TestRingHash_SwitchToLowerPriorityAndThenBack was also flaky, I also removed
it while investigating.

- TestRingHash_ContinuesConnectingWithoutPicksOneSubchannelAtATime, I'm not sure
we implement this behavior, and if we do, it's not working the same way as in
c-core, where the order of subchannel connection attempts is based on the
resolver address order rather than the ring order.

I will follow up with fixes for each one of the remaining tests.
@atollena atollena force-pushed the issue-6072-part-2 branch from d6d26a5 to 321d866 Compare June 19, 2024 11:10
@atollena atollena marked this pull request as ready for review June 20, 2024 11:47
@easwars
Copy link
Contributor

easwars commented Jun 26, 2024

@atollena : Looks like there are some merge conflicts. Could you please take care of them before I start looking. Thanks.

@easwars easwars assigned atollena and unassigned easwars Jun 26, 2024
@atollena atollena assigned easwars and unassigned atollena Jun 27, 2024
@atollena
Copy link
Collaborator Author

@atollena : Looks like there are some merge conflicts. Could you please take care of them before I start looking. Thanks.

Done. This is ready for review.

@atollena
Copy link
Collaborator Author

FYI the remaining 4 tests that were failing, mentioned in the description, are caused by #7363.

internal/testutils/blocking_context_dialer.go Show resolved Hide resolved
internal/testutils/blocking_context_dialer.go Outdated Show resolved Hide resolved
internal/testutils/blocking_context_dialer.go Outdated Show resolved Hide resolved
internal/testutils/blocking_context_dialer_test.go Outdated Show resolved Hide resolved
internal/testutils/blocking_context_dialer_test.go Outdated Show resolved Hide resolved
@easwars easwars assigned atollena and unassigned easwars Jun 28, 2024
@atollena atollena assigned easwars and unassigned atollena Jul 2, 2024
@easwars easwars assigned atollena and unassigned easwars Jul 16, 2024
@atollena atollena assigned easwars and unassigned atollena Jul 17, 2024
@atollena
Copy link
Collaborator Author

Thanks @easwars, I answered all your comments. This is ready for another round.

@atollena
Copy link
Collaborator Author

vet failure is a false positive due to #7421.

@easwars
Copy link
Contributor

easwars commented Jul 17, 2024

Thanks @easwars, I answered all your comments. This is ready for another round.

Thank you very much for patiently addressing all comments and thank you again for doing this.

@easwars easwars merged commit 4ed8180 into grpc:master Jul 17, 2024
13 checks passed
@atollena atollena deleted the issue-6072-part-2 branch July 18, 2024 07:59
printchard pushed a commit to printchard/grpc-go that referenced this pull request Jul 30, 2024
printchard pushed a commit to printchard/grpc-go that referenced this pull request Jul 30, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 15, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ringhash: improve test coverage
2 participants