This is an automated cherry-pick of pingcap#1261

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot · Jun 22, 2021 · c894205 · c894205
1 parent 35ecb54
commit c894205
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/pkg/lightning/backend/local/local.go b/pkg/lightning/backend/local/local.go
@@ -1135,8 +1135,13 @@ func (local *local) writeAndIngestByRange(
 	if !hasKey {
 		log.L().Info("There is no pairs in iterator",
 			logutil.Key("start", start),
+<<<<<<< HEAD
 			logutil.Key("end", end),
 			logutil.Key("next end", nextKey(end)))
+=======
+			logutil.Key("end", end))
+		engineFile.finishedRanges.add(Range{start: start, end: end})
+>>>>>>> 88936a3a (lightning: fix panic in `nextKey` (#1261))
 		return nil
 	}
 	pairStart := append([]byte{}, iter.Key()...)