From ef7c2d59c1c9b3b74a5bd10d54f205c0a68016b9 Mon Sep 17 00:00:00 2001 From: Larry Safran Date: Thu, 19 Dec 2024 14:46:58 -0800 Subject: [PATCH] xds: Fix XDS control plane client retry timer backoff duration when connection closes after results are received (#11766) * Fix retry timer backoff duration. * Reset stopwatch when we had results on AdsStream rather than change the delay calculation logic. --- xds/src/main/java/io/grpc/xds/client/ControlPlaneClient.java | 1 + xds/src/test/java/io/grpc/xds/GrpcXdsClientImplTestBase.java | 1 + 2 files changed, 2 insertions(+) diff --git a/xds/src/main/java/io/grpc/xds/client/ControlPlaneClient.java b/xds/src/main/java/io/grpc/xds/client/ControlPlaneClient.java index 047f8a2e315..9c7d744816a 100644 --- a/xds/src/main/java/io/grpc/xds/client/ControlPlaneClient.java +++ b/xds/src/main/java/io/grpc/xds/client/ControlPlaneClient.java @@ -446,6 +446,7 @@ private void handleRpcStreamClosed(Status status) { // Reset the backoff sequence if had received a response, or backoff sequence // has never been initialized. retryBackoffPolicy = backoffPolicyProvider.get(); + stopwatch.reset(); } // FakeClock in tests isn't thread-safe. Schedule the retry timer before notifying callbacks diff --git a/xds/src/test/java/io/grpc/xds/GrpcXdsClientImplTestBase.java b/xds/src/test/java/io/grpc/xds/GrpcXdsClientImplTestBase.java index f1c114673b5..1b0c363d94f 100644 --- a/xds/src/test/java/io/grpc/xds/GrpcXdsClientImplTestBase.java +++ b/xds/src/test/java/io/grpc/xds/GrpcXdsClientImplTestBase.java @@ -3524,6 +3524,7 @@ public void streamClosedAndRetryWithBackoff() { call.verifyRequest(EDS, EDS_RESOURCE, "", "", NODE); // Management server closes the RPC stream with an error. + fakeClock.forwardNanos(1000L); // Make sure retry isn't based on stopwatch 0 call.sendError(Status.UNKNOWN.asException()); verify(ldsResourceWatcher, Mockito.timeout(1000).times(1)) .onError(errorCaptor.capture());