DM: fix default physical import mode disk quota (#8680)

close #8672
pingcap · Mar 24, 2023 · dfac8e3 · dfac8e3
1 parent fd2efea
commit dfac8e3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/dm/loader/lightning.go b/dm/loader/lightning.go
@@ -348,7 +348,9 @@ func GetLightningConfig(globalCfg *lcfg.GlobalConfig, subtaskCfg *config.SubTask
 	// checkpoint meta and updating dm checkpoint meta to 'finished'.
 	cfg.Checkpoint.KeepAfterSuccess = lcfg.CheckpointRemove
 
-	cfg.TikvImporter.DiskQuota = subtaskCfg.LoaderConfig.DiskQuotaPhysical
+	if subtaskCfg.LoaderConfig.DiskQuotaPhysical > 0 {
+		cfg.TikvImporter.DiskQuota = subtaskCfg.LoaderConfig.DiskQuotaPhysical
+	}
 	cfg.TikvImporter.OnDuplicate = string(subtaskCfg.OnDuplicateLogical)
 	cfg.TikvImporter.IncrementalImport = true
 	switch subtaskCfg.OnDuplicatePhysical {

diff --git a/dm/loader/lightning_test.go b/dm/loader/lightning_test.go
@@ -68,4 +68,7 @@ func TestGetLightiningConfig(t *testing.T) {
 	require.Equal(t, 32, conf.TikvImporter.RangeConcurrency)
 	require.Equal(t, lcfg.CompressionGzip, conf.TikvImporter.CompressKVPairs)
 	require.Equal(t, lcfg.OpLevelRequired, conf.PostRestore.Analyze)
+	lightningDefaultQuota := lcfg.NewConfig().TikvImporter.DiskQuota
+	// when we don't set dm loader disk quota, it should be equal to lightning's default quota
+	require.Equal(t, lightningDefaultQuota, conf.TikvImporter.DiskQuota)
 }