mirror of https://github.com/grpc/grpc-java.git
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:
parent
5f4bc15f83
commit
b836b36777
|
@ -248,7 +248,7 @@ final class ClientCallImpl<ReqT, RespT> extends ClientCall<ReqT, RespT> {
|
|||
boolean deadlineExceeded = effectiveDeadline != null && effectiveDeadline.isExpired();
|
||||
if (!deadlineExceeded) {
|
||||
logIfContextNarrowedTimeout(
|
||||
effectiveDeadline, callOptions.getDeadline(), context.getDeadline());
|
||||
effectiveDeadline, context.getDeadline(), callOptions.getDeadline());
|
||||
if (retryEnabled) {
|
||||
stream = clientTransportProvider.newRetriableStream(method, callOptions, headers, context);
|
||||
} else {
|
||||
|
|
Loading…
Reference in New Issue