cherry pick pingcap#15503 to release-2.1

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
ti-srebot · Jul 24, 2020 · 57bddbc · 57bddbc
1 parent 10140bb
commit 57bddbc
Show file tree

Hide file tree

Showing 9 changed files with 2,749 additions and 9 deletions.
diff --git a/config/config.go b/config/config.go
@@ -331,6 +331,7 @@ var defaultConf = Config{
 		MetricsInterval: 15,
 	},
 	Performance: Performance{
+<<<<<<< HEAD
 		TCPKeepAlive:        true,
 		CrossJoin:           true,
 		StatsLease:          "3s",
@@ -347,6 +348,26 @@ var defaultConf = Config{
 	XProtocol: XProtocol{
 		XHost: "",
 		XPort: 0,
+=======
+		MaxMemory:            0,
+		ServerMemoryQuota:    0,
+		TCPKeepAlive:         true,
+		CrossJoin:            true,
+		StatsLease:           "3s",
+		RunAutoAnalyze:       true,
+		StmtCountLimit:       5000,
+		FeedbackProbability:  0.05,
+		QueryFeedbackLimit:   512,
+		PseudoEstimateRatio:  0.8,
+		ForcePriority:        "NO_PRIORITY",
+		BindInfoLease:        "3s",
+		TxnEntrySizeLimit:    DefTxnEntrySizeLimit,
+		TxnTotalSizeLimit:    DefTxnTotalSizeLimit,
+		DistinctAggPushDown:  false,
+		CommitterConcurrency: 16,
+		MaxTxnTTL:            10 * 60 * 1000, // 10min
+		MemProfileInterval:   "1m",
+>>>>>>> a99fdc0... statistics: ease the impact of stats feedback on cluster (#15503)
 	},
 	ProxyProtocol: ProxyProtocol{
 		Networks:      "",

diff --git a/config/config.toml.example b/config/config.toml.example
@@ -165,7 +165,7 @@ run-auto-analyze = true
 feedback-probability = 0.05
 
 # The max number of query feedback that cache in memory.
-query-feedback-limit = 1024
+query-feedback-limit = 512
 
 # Pseudo stats will be used if the ratio between the modify count and
 # row count in statistics of a table is greater than it.