@@ -49,6 +49,7 @@ import (
4949 v3lrspb "github.com/envoyproxy/go-control-plane/envoy/service/load_stats/v3"
5050 testgrpc "google.golang.org/grpc/interop/grpc_testing"
5151 testpb "google.golang.org/grpc/interop/grpc_testing"
52+ "google.golang.org/protobuf/types/known/wrapperspb"
5253
5354 _ "google.golang.org/grpc/xds"
5455)
@@ -214,10 +215,15 @@ func (s) TestLoadReportingPickFirstMultiLocality(t *testing.T) {
214215 routeConfigName := "route-" + serviceName
215216 clusterName := "cluster-" + serviceName
216217 endpointsName := "endpoints-" + serviceName
218+ routePolicy := e2e .DefaultRouteConfig (routeConfigName , serviceName , clusterName )
219+ routePolicy .VirtualHosts [0 ].RetryPolicy = & v3routepb.RetryPolicy {
220+ RetryOn : "unavailable" ,
221+ NumRetries : & wrapperspb.UInt32Value {Value : 1 },
222+ }
217223 resources := e2e.UpdateOptions {
218224 NodeID : nodeID ,
219225 Listeners : []* v3listenerpb.Listener {e2e .DefaultClientListener (serviceName , routeConfigName )},
220- Routes : []* v3routepb.RouteConfiguration {e2e . DefaultRouteConfig ( routeConfigName , serviceName , clusterName ) },
226+ Routes : []* v3routepb.RouteConfiguration {routePolicy },
221227 Clusters : []* v3clusterpb.Cluster {
222228 {
223229 Name : clusterName ,
@@ -321,9 +327,9 @@ func (s) TestLoadReportingPickFirstMultiLocality(t *testing.T) {
321327 // Stop server 1 and send one more rpc. Now the request should go to server 2.
322328 server1 .Stop ()
323329 // The first call may go to server 1 and fail, so we send two requests.
324- if _ , err := client .EmptyCall (ctx , & testpb.Empty {}, grpc .Peer (& peer )); err != nil {
325- t .Logf ("First rpc EmptyCall() failed: %v" , err )
326- }
330+ // if _, err := client.EmptyCall(ctx, &testpb.Empty{}, grpc.Peer(&peer)); err != nil {
331+ // t.Logf("First rpc EmptyCall() failed: %v", err)
332+ // }
327333
328334 if _ , err := client .EmptyCall (ctx , & testpb.Empty {}, grpc .Peer (& peer )); err != nil {
329335 t .Fatalf ("rpc EmptyCall() failed: %v" , err )
0 commit comments