tests,restore: prevent spurious error in checkpoint_chunks test

Only kill Lightning if the whole chunk is imported exactly. The chunk checkpoint may be recorded before a chunk is fully written, and this will hit the failpoint more than 5 times.
pingcap · Mar 15, 2019 · 44db439 · 44db439
1 parent 193d876
commit 44db439
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/lightning/restore/restore.go b/lightning/restore/restore.go
@@ -347,8 +347,8 @@ func (rc *RestoreController) listenCheckpointUpdates(wg *sync.WaitGroup) {
 
 		lock.Unlock()
 
-		// gofail: var FailIfImportedChunk struct{}
-		// if _, ok := scp.merger.(*ChunkCheckpointMerger); ok {
+		// gofail: var FailIfImportedChunk int
+		// if merger, ok := scp.merger.(*ChunkCheckpointMerger); ok && merger.Checksum.SumKVS() >= uint64(FailIfImportedChunk) {
 		// 	wg.Wait()
 		// 	panic("forcing failure due to FailIfImportedChunk")
 		// }

diff --git a/tests/checkpoint_chunks/config.toml b/tests/checkpoint_chunks/config.toml
@@ -2,7 +2,7 @@
 region-concurrency = 1
 check-requirements = false
 file = "/tmp/lightning_test_result/lightning.log"
-level = "error"
+level = "info"
 
 [checkpoint]
 enable = true

diff --git a/tests/checkpoint_chunks/file.toml b/tests/checkpoint_chunks/file.toml
@@ -2,7 +2,7 @@
 region-concurrency = 1
 check-requirements = false
 file = "/tmp/lightning_test_result/lightning.log"
-level = "error"
+level = "info"
 
 [checkpoint]
 enable = true

diff --git a/tests/checkpoint_chunks/run.sh b/tests/checkpoint_chunks/run.sh
@@ -33,7 +33,7 @@ done
 
 # Set the failpoint to kill the lightning instance as soon as one chunk is imported
 # If checkpoint does work, this should only kill $CHUNK_COUNT instances of lightnings.
-export GOFAIL_FAILPOINTS='github.com/pingcap/tidb-lightning/lightning/restore/FailIfImportedChunk=return'
+export GOFAIL_FAILPOINTS="github.com/pingcap/tidb-lightning/lightning/restore/FailIfImportedChunk=return($ROW_COUNT)"
 
 # Start importing the tables.
 run_sql 'DROP DATABASE IF EXISTS cpch_tsr'