Merge branch 'master' into patch-2

pingcap · Apr 3, 2021 · 9a1b166 · 9a1b166
2 parents cdb7e3d + e60f822
commit 9a1b166
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/pkg/checkpoint/checkpoint.go b/pkg/checkpoint/checkpoint.go
@@ -38,6 +38,9 @@ const (
 	goroutineKey = contextKey("CHECKPOINT_GOROUTINE")
 	funcKey      = "__func__"
 	hashKey      = "__hash__"
+
+	// At most 10M for each line in audit log
+	maxTokenSize = 10 * 1024 * 1024
 )
 
 var (
@@ -125,6 +128,7 @@ func NewCheckPoint(r io.Reader) (*CheckPoint, error) {
 	cp := CheckPoint{points: make([]map[string]interface{}, 0)}
 
 	scanner := bufio.NewScanner(r)
+	scanner.Buffer(nil, maxTokenSize)
 	for scanner.Scan() {
 		line := scanner.Text()
 		m, err := checkLine(line)

diff --git a/pkg/cluster/manager/reload.go b/pkg/cluster/manager/reload.go
@@ -69,7 +69,7 @@ func (m *Manager) Reload(name string, opt operator.Options, skipRestart, skipCon
 		}
 	})
 
-	refreshConfigTasks, hasImported := buildRegenConfigTasks(m, name, topo, base, nil, false)
+	refreshConfigTasks, hasImported := buildRegenConfigTasks(m, name, topo, base, nil, opt.IgnoreConfigCheck)
 	monitorConfigTasks := buildRefreshMonitoredConfigTasks(
 		m.specManager,
 		name,