Don't send calls with 0 ttl even for low TTLs

uber · Aug 16, 2016 · 0e62532 · 0e62532
1 parent 99f494d
commit 0e62532
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/messages.go b/messages.go
@@ -212,7 +212,7 @@ func (m *callReq) read(r *typed.ReadBuffer) error {
 }
 
 func (m *callReq) write(w *typed.WriteBuffer) error {
-	w.WriteUint32(uint32(m.TimeToLive.Seconds() * 1000))
+	w.WriteUint32(uint32(m.TimeToLive / time.Millisecond))
 	m.Tracing.write(w)
 	w.WriteLen8String(m.Service)
 	m.Headers.write(w)

diff --git a/outbound.go b/outbound.go
@@ -55,8 +55,11 @@ func (c *Connection) beginCall(ctx context.Context, serviceName, methodName stri
 		// never get here.
 		return nil, ErrTimeoutRequired
 	}
+
+	// If the timeToLive is less than a millisecond, it will be encoded as 0 on
+	// the wire, hence we return a timeout immediately.
 	timeToLive := deadline.Sub(now)
-	if timeToLive <= 0 {
+	if timeToLive < time.Millisecond {
 		return nil, ErrTimeout
 	}