restore: do record error comes from stream.Close() (pingcap#78)

YuJuncen · Oct 18, 2018 · cc2b3e8 · cc2b3e8
1 parent dcaf1b1
commit cc2b3e8
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lightning/restore/restore.go b/lightning/restore/restore.go
@@ -1117,7 +1117,11 @@ outside:
 		}
 		err = stream.Put(totalKVs)
 		if e := stream.Close(); e != nil {
-			common.AppLogger.Warnf("failed to close write stream: %s", e.Error())
+			if err != nil {
+				common.AppLogger.Warnf("failed to close write stream: %s", e.Error())
+			} else {
+				err = e
+			}
 		}
 		metrics.MarkTiming(deliverMark, start)
 		if err != nil {