From c2185e1b373a99509c1be5c773059162c256489c Mon Sep 17 00:00:00 2001
From: "Sahdev P. Zala" <spzala@us.ibm.com>
Date: Sun, 7 Jan 2018 21:21:21 -0500
Subject: [PATCH] Log: debug user cancellation and log warning for rest

The context error with cancel code is typically for user cancellation which
should be at debug level. For other error codes we should display a warning.

Fixes #9085
---
 etcdserver/api/v3rpc/util.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/etcdserver/api/v3rpc/util.go b/etcdserver/api/v3rpc/util.go
index ec34249c1eb5..e4bb85ae7552 100644
--- a/etcdserver/api/v3rpc/util.go
+++ b/etcdserver/api/v3rpc/util.go
@@ -84,9 +84,13 @@ func togRPCError(err error) error {
 
 func isClientCtxErr(ctxErr error, err error) bool {
 	if ctxErr != nil {
-		return ctxErr == context.Canceled || ctxErr == context.DeadlineExceeded
+		return true
+	}
+
+	ev, ok := status.FromError(err)
+	if !ok {
+		return false
 	}
-	ev, _ := status.FromError(err)
 	code := ev.Code()
 	return code == codes.Canceled || code == codes.DeadlineExceeded
 }