-
Notifications
You must be signed in to change notification settings - Fork 4.4k
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
xds/ringhash: make reconnection logic work for a single subConn #5601
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
153 changes: 153 additions & 0 deletions
153
xds/internal/balancer/ringhash/e2e/ringhash_balancer_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| /* | ||
| * | ||
| * Copyright 2022 gRPC authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| package ringhash_test | ||
|
|
||
| import ( | ||
| "context" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "google.golang.org/grpc" | ||
| "google.golang.org/grpc/connectivity" | ||
| "google.golang.org/grpc/credentials/insecure" | ||
| "google.golang.org/grpc/internal/grpctest" | ||
| "google.golang.org/grpc/internal/testutils" | ||
| "google.golang.org/grpc/resolver" | ||
| "google.golang.org/grpc/resolver/manual" | ||
|
|
||
| testgrpc "google.golang.org/grpc/test/grpc_testing" | ||
| testpb "google.golang.org/grpc/test/grpc_testing" | ||
|
|
||
| _ "google.golang.org/grpc/xds/internal/balancer/ringhash" // Register the ring_hash_experimental LB policy. | ||
| ) | ||
|
|
||
| type s struct { | ||
| grpctest.Tester | ||
| } | ||
|
|
||
| func Test(t *testing.T) { | ||
| grpctest.RunSubTests(t, s{}) | ||
| } | ||
|
|
||
| const ( | ||
| defaultTestTimeout = 10 * time.Second | ||
| defaultTestShortTimeout = 10 * time.Millisecond // For events expected to *not* happen. | ||
| ) | ||
|
|
||
| type testService struct { | ||
| testpb.TestServiceServer | ||
| } | ||
|
|
||
| func (*testService) EmptyCall(context.Context, *testpb.Empty) (*testpb.Empty, error) { | ||
| return &testpb.Empty{}, nil | ||
| } | ||
|
|
||
| // TestRingHash_ReconnectToMoveOutOfTransientFailure tests the case where the | ||
| // ring contains a single subConn, and verifies that when the server goes down, | ||
| // the LB policy on the client automatically reconnects until the subChannel | ||
| // moves out of TRANSIENT_FAILURE. | ||
| func (s) TestRingHash_ReconnectToMoveOutOfTransientFailure(t *testing.T) { | ||
| // Create a restartable listener to simulate server being down. | ||
| l, err := testutils.LocalTCPListener() | ||
| if err != nil { | ||
| t.Fatalf("testutils.LocalTCPListener() failed: %v", err) | ||
| } | ||
| lis := testutils.NewRestartableListener(l) | ||
|
|
||
| // Start a server backend exposing the test service. | ||
| server := grpc.NewServer() | ||
| defer server.Stop() | ||
| testgrpc.RegisterTestServiceServer(server, &testService{}) | ||
| go func() { | ||
| if err := server.Serve(lis); err != nil { | ||
| t.Errorf("Serve() failed: %v", err) | ||
| } | ||
| }() | ||
|
|
||
| // Create a clientConn with a manual resolver (which is used to push the | ||
| // address of the test backend), and a default service config pointing to | ||
| // the use of the ring_hash_experimental LB policy. | ||
| const ringHashServiceConfig = `{"loadBalancingConfig": [{"ring_hash_experimental":{}}]}` | ||
| r := manual.NewBuilderWithScheme("whatever") | ||
| dopts := []grpc.DialOption{ | ||
| grpc.WithTransportCredentials(insecure.NewCredentials()), | ||
| grpc.WithResolvers(r), | ||
| grpc.WithDefaultServiceConfig(ringHashServiceConfig), | ||
| } | ||
| cc, err := grpc.Dial(r.Scheme()+":///test.server", dopts...) | ||
| if err != nil { | ||
| t.Fatalf("failed to dial local test server: %v", err) | ||
| } | ||
| defer cc.Close() | ||
|
|
||
| // Push the address of the test backend through the manual resolver. | ||
| r.UpdateState(resolver.State{Addresses: []resolver.Address{{Addr: lis.Addr().String()}}}) | ||
|
|
||
| ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout) | ||
| defer cancel() | ||
| client := testgrpc.NewTestServiceClient(cc) | ||
| if _, err := client.EmptyCall(ctx, &testpb.Empty{}); err != nil { | ||
| t.Fatalf("rpc EmptyCall() failed: %v", err) | ||
| } | ||
|
|
||
| // Stopping the server listener will close the transport on the client, | ||
| // which will lead to the channel eventually moving to IDLE. The ring_hash | ||
| // LB policy is not expected to reconnect by itself at this point. | ||
| lis.Stop() | ||
| for state := cc.GetState(); state != connectivity.Idle && cc.WaitForStateChange(ctx, state); state = cc.GetState() { | ||
| } | ||
| if err := ctx.Err(); err != nil { | ||
| t.Fatalf("Timeout waiting for channel to reach %q after server shutdown: %v", connectivity.Idle, err) | ||
| } | ||
|
|
||
| // Make an RPC to get the ring_hash LB policy to reconnect and thereby move | ||
| // to TRANSIENT_FAILURE upon connection failure. | ||
| client.EmptyCall(ctx, &testpb.Empty{}) | ||
| for ; ctx.Err() == nil; <-time.After(defaultTestShortTimeout) { | ||
| if cc.GetState() == connectivity.TransientFailure { | ||
| break | ||
| } | ||
| } | ||
| if err := ctx.Err(); err != nil { | ||
| t.Fatalf("Timeout waiting for channel to reach %q after server shutdown: %v", connectivity.TransientFailure, err) | ||
| } | ||
|
|
||
| // An RPC at this point is expected to fail. | ||
| if _, err = client.EmptyCall(ctx, &testpb.Empty{}); err == nil { | ||
| t.Fatal("EmptyCall RPC succeeded when the channel is in TRANSIENT_FAILURE") | ||
| } | ||
|
|
||
| // Restart the server listener. The ring_hash LB polcy is expected to | ||
| // attempt to reconnect on its own and come out of TRANSIENT_FAILURE, even | ||
| // without an RPC attempt. | ||
| lis.Restart() | ||
| for ; ctx.Err() == nil; <-time.After(defaultTestShortTimeout) { | ||
| if cc.GetState() == connectivity.Ready { | ||
| break | ||
| } | ||
| } | ||
| if err := ctx.Err(); err != nil { | ||
| t.Fatalf("Timeout waiting for channel to reach READT after server restart: %v", err) | ||
| } | ||
|
|
||
| // An RPC at this point is expected to fail. | ||
| if _, err := client.EmptyCall(ctx, &testpb.Empty{}); err != nil { | ||
| t.Fatalf("rpc EmptyCall() failed: %v", err) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Logging the exact same text here could make it hard to distinguish which operation is occurring. Did we just queue the connect attempt, or was it queued when the subconn went IDLE? Maybe this distinction is unimportant?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The connection attempt is queued (by calling
queueConnect()method) fromUpdateSubConnState()when we want to start connecting on the next available subConn.But this
queueConnect()method actually starts connecting only if the subConn is inIDLE. For all other states, it set theconnectQueuedbit to true, and when that subConn eventually transitions toIDLE, the connect attempt is made. SeesetState()which is called fromUpdateSubConnState().I think the distinction is not important here, whether the connection attempt happened right when it was queued or when it eventually moved to IDLE. What do you think?