flasn4nt
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move retrieval of elapsed time in handleRpcStreamClosed to make TSan happy (#9923) 

* In `handleRpcStreamClosed()`, move retry handling to before the call to `xdsResponseHandler.handleStreamClosed()` so that TSan doesn't report a race condition that is completely meaningless.

fixes #9920
This commit is contained in:
Larry Safran 2023-03-02 23:28:37 +00:00 committed by GitHub
parent c367b267c6
commit 95a44e0592
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
xds/src/main/java/io/grpc/xds/AbstractXdsClient.java
View File

@ -330,6 +330,17 @@ final class AbstractXdsClient {
return; return;
} }
if (responseReceived || retryBackoffPolicy == null) {
// Reset the backoff sequence if had received a response, or backoff sequence
// has never been initialized.
retryBackoffPolicy = backoffPolicyProvider.get();
}
// Need this here to avoid tsan race condition in XdsClientImplTestBase.sendToNonexistentHost
long elapsed = stopwatch.elapsed(TimeUnit.NANOSECONDS);
long delayNanos = Math.max(0, retryBackoffPolicy.nextBackoffNanos() - elapsed);
rpcRetryTimer = syncContext.schedule(
new RpcRetryTask(), delayNanos, TimeUnit.NANOSECONDS, timeService);
checkArgument(!error.isOk(), "unexpected OK status"); checkArgument(!error.isOk(), "unexpected OK status");
String errorMsg = error.getDescription() != null String errorMsg = error.getDescription() != null
&& error.getDescription().equals(CLOSED_BY_SERVER) && error.getDescription().equals(CLOSED_BY_SERVER)
@ -341,17 +352,7 @@ final class AbstractXdsClient {
xdsResponseHandler.handleStreamClosed(error); xdsResponseHandler.handleStreamClosed(error);
cleanUp(); cleanUp();
if (responseReceived || retryBackoffPolicy == null) {
// Reset the backoff sequence if had received a response, or backoff sequence
// has never been initialized.
retryBackoffPolicy = backoffPolicyProvider.get();
}
long delayNanos = Math.max(
0,
retryBackoffPolicy.nextBackoffNanos() - stopwatch.elapsed(TimeUnit.NANOSECONDS));
logger.log(XdsLogLevel.INFO, "Retry ADS stream in {0} ns", delayNanos); logger.log(XdsLogLevel.INFO, "Retry ADS stream in {0} ns", delayNanos);
rpcRetryTimer = syncContext.schedule(
new RpcRetryTask(), delayNanos, TimeUnit.NANOSECONDS, timeService);
} }
private void close(Exception error) { private void close(Exception error) {