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

core: Fix FINE deadline logging 

We were logging when withDeadline() was used, not when the Context was used. As
discovered while looking at https://stackoverflow.com/q/56593692/4690866 .

In e19e8f7d updateTimeoutHeaders was removed and logIfContextNarrowedTimeout
was called directly. However, the two methods had reverse ordering of
callDeadine/outerCallDeadline and the caller did not get their arguments
swapped.
This commit is contained in:
Eric Anderson 2019-06-14 08:47:37 -07:00
parent 5f4bc15f83
commit b836b36777
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/io/grpc/internal/ClientCallImpl.java
View File

@ -248,7 +248,7 @@ final class ClientCallImpl<ReqT, RespT> extends ClientCall<ReqT, RespT> {
boolean deadlineExceeded = effectiveDeadline != null && effectiveDeadline.isExpired(); boolean deadlineExceeded = effectiveDeadline != null && effectiveDeadline.isExpired();
if (!deadlineExceeded) { if (!deadlineExceeded) {
logIfContextNarrowedTimeout( logIfContextNarrowedTimeout(
effectiveDeadline, callOptions.getDeadline(), context.getDeadline()); effectiveDeadline, context.getDeadline(), callOptions.getDeadline());
if (retryEnabled) { if (retryEnabled) {
stream = clientTransportProvider.newRetriableStream(method, callOptions, headers, context); stream = clientTransportProvider.newRetriableStream(method, callOptions, headers, context);
} else { } else {