Merge 16d9e98 into b473e5e

tikv · Dec 26, 2018 · 6afccaa · 6afccaa
2 parents b473e5e + 16d9e98
commit 6afccaa
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/server/leader.go b/server/leader.go
@@ -284,7 +284,9 @@ func (s *Server) campaignLeader() error {
 				return nil
 			}
 		case <-ctx.Done():
-			return errors.New("server closed")
+			// Server is closed and it should return nil.
+			log.Info("server is closed")
+			return nil
 		}
 	}
 }