diff options
| author |  Sree Kuchibhotla <sreecha@users.noreply.github.com> | 2018-05-22 12:33:19 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-05-22 12:33:19 -0700 |
| commit | 4a7a39fab6f32e51f6e3ff249860f833cad73bbf (patch) | |
| tree | c01ecbd677dd5441b11af3f7c6d43b7e13c0452d /src/core/ext/filters/client_channel/lb_policy/grpclb | |
| parent | 463e4d56193bbaec3977ce38fb8f0103d006794e (diff) | |
| parent | a2171d49bfacc2a9f364a17ee50c6d89767cdb6c (diff) | |
Merge pull request #14894 from sreecha/fix-time
Fix grpc_millis type (timers are broken on 32-bit systems otherwise)
Diffstat (limited to 'src/core/ext/filters/client_channel/lb_policy/grpclb')
| -rw-r--r-- | src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc index 0d57fa2d02..263b51ae89 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc @@ -776,7 +776,7 @@ void GrpcLb::BalancerCallState::OnBalancerMessageReceivedLocked( if (grpc_lb_glb_trace.enabled()) { gpr_log(GPR_INFO, "[grpclb %p] Received initial LB response message; " - "client load reporting interval = %" PRIdPTR " milliseconds", + "client load reporting interval = %" PRId64 " milliseconds", grpclb_policy, lb_calld->client_stats_report_interval_); } } else if (grpc_lb_glb_trace.enabled()) { @@ -1417,7 +1417,7 @@ void GrpcLb::StartBalancerCallRetryTimerLocked() { gpr_log(GPR_INFO, "[grpclb %p] Connection to LB server lost...", this); grpc_millis timeout = next_try - ExecCtx::Get()->Now(); if (timeout > 0) { - gpr_log(GPR_INFO, "[grpclb %p] ... retry_timer_active in %" PRIuPTR "ms.", + gpr_log(GPR_INFO, "[grpclb %p] ... retry_timer_active in %" PRId64 "ms.", this, timeout); } else { gpr_log(GPR_INFO, "[grpclb %p] ... retry_timer_active immediately.", |