Merge pull request #10574 from johncming/rename_err

raft: more precise that rename res to err.
etcd-io · Mar 22, 2019 · 7a5acb4 · 7a5acb4
2 parents 41f7142 + 92d5d19
commit 7a5acb4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/raft/node.go b/raft/node.go
@@ -504,9 +504,9 @@ func (n *node) stepWithWaitOption(ctx context.Context, m pb.Message, wait bool)
 		return ErrStopped
 	}
 	select {
-	case rsp := <-pm.result:
-		if rsp != nil {
-			return rsp
+	case err := <-pm.result:
+		if err != nil {
+			return err
 		}
 	case <-ctx.Done():
 		return ctx.Err()