fix a bug

pingcap · May 6, 2021 · 74089ac · 74089ac
1 parent 29b593e
commit 74089ac
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/pkg/lightning/restore/restore.go b/pkg/lightning/restore/restore.go
@@ -1689,15 +1689,18 @@ func (tr *TableRestore) restoreEngine(
 			if err == nil {
 				metric.ChunkCounter.WithLabelValues(metric.ChunkStateFinished).Add(remainChunkCnt)
 				metric.BytesCounter.WithLabelValues(metric.TableStateWritten).Add(float64(cr.chunk.Checksum.SumSize()))
-				if dataFlushStatus != nil && !dataFlushStatus.Flushed() &&
-					indexFlushStaus != nil && !indexFlushStaus.Flushed() {
-					checkFlushLock.Lock()
-					flushPendingChunks = append(flushPendingChunks, chunkFlushStatus{
-						dataStatus:  dataFlushStatus,
-						indexStatus: indexFlushStaus,
-						chunkCp:     cr.chunk,
-					})
-					checkFlushLock.Unlock()
+				if dataFlushStatus != nil && indexFlushStaus != nil && !indexFlushStaus.Flushed() {
+					if dataFlushStatus.Flushed() && indexFlushStaus.Flushed() {
+						saveCheckpoint(rc, tr, engineID, cr.chunk)
+					} else {
+						checkFlushLock.Lock()
+						flushPendingChunks = append(flushPendingChunks, chunkFlushStatus{
+							dataStatus:  dataFlushStatus,
+							indexStatus: indexFlushStaus,
+							chunkCp:     cr.chunk,
+						})
+						checkFlushLock.Unlock()
+					}
 				}
 			} else {
 				metric.ChunkCounter.WithLabelValues(metric.ChunkStateFailed).Add(remainChunkCnt)