Merge branch 'master' into kennytm/schema-tracker

pingcap · Dec 5, 2019 · 8169a88 · 8169a88
2 parents acbd9ec + 9a07a50
commit 8169a88
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/syncer/syncer.go b/syncer/syncer.go
@@ -962,7 +962,9 @@ func (s *Syncer) sync(ctx *tcontext.Context, queueBucket string, db *DBConn, job
 
 	fatalF := func(err error, errType pb.ErrorType) {
 		s.execErrorDetected.Set(true)
-		s.runFatalChan <- unit.NewProcessError(errType, err)
+		if !utils.IsContextCanceledError(err) {
+			s.runFatalChan <- unit.NewProcessError(errType, err)
+		}
 		clearF()
 	}