Skip to content

Commit 6c9ee36

Browse files
okJiangokJiang
authored
var: enable pd_enable_follower_handle_region as default (#58385)
close #58384
1 parent 67249cb commit 6c9ee36

File tree

5 files changed

+114
-9
lines changed

5 files changed

+114
-9
lines changed

‎pkg/executor/set_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -655,11 +655,11 @@ func TestSetVar(t *testing.T) {
655655
tk.MustExec("set global tidb_enable_tso_follower_proxy = 0")
656656
tk.MustQuery("select @@tidb_enable_tso_follower_proxy").Check(testkit.Rows("0"))
657657
require.Error(t, tk.ExecToErr("set tidb_enable_tso_follower_proxy = 1"))
658-
tk.MustQuery("select @@pd_enable_follower_handle_region").Check(testkit.Rows("0"))
659-
tk.MustExec("set global pd_enable_follower_handle_region = 1")
660658
tk.MustQuery("select @@pd_enable_follower_handle_region").Check(testkit.Rows("1"))
661659
tk.MustExec("set global pd_enable_follower_handle_region = 0")
662660
tk.MustQuery("select @@pd_enable_follower_handle_region").Check(testkit.Rows("0"))
661+
tk.MustExec("set global pd_enable_follower_handle_region = 1")
662+
tk.MustQuery("select @@pd_enable_follower_handle_region").Check(testkit.Rows("1"))
663663
require.Error(t, tk.ExecToErr("set pd_enable_follower_handle_region = 1"))
664664

665665
tk.MustQuery("select @@tidb_enable_historical_stats").Check(testkit.Rows("0"))

‎pkg/metrics/grafana/tidb.json

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13336,6 +13336,111 @@
1333613336
"alignLevel": null
1333713337
}
1333813338
},
13339+
{
13340+
"aliasColors": {},
13341+
"bars": false,
13342+
"dashLength": 10,
13343+
"dashes": false,
13344+
"datasource": "${DS_TEST-CLUSTER}",
13345+
"description": "The stale regions from PD per second.",
13346+
"editable": true,
13347+
"error": false,
13348+
"fieldConfig": {
13349+
"defaults": {},
13350+
"overrides": []
13351+
},
13352+
"fill": 0,
13353+
"fillGradient": 0,
13354+
"grid": {},
13355+
"gridPos": {
13356+
"h": 7,
13357+
"w": 8,
13358+
"x": 8,
13359+
"y": 37
13360+
},
13361+
"hiddenSeries": false,
13362+
"id": 339,
13363+
"legend": {
13364+
"alignAsTable": true,
13365+
"avg": false,
13366+
"current": false,
13367+
"max": false,
13368+
"min": false,
13369+
"rightSide": true,
13370+
"show": true,
13371+
"total": false,
13372+
"values": false
13373+
},
13374+
"lines": true,
13375+
"linewidth": 2,
13376+
"links": [],
13377+
"nullPointMode": "null as zero",
13378+
"options": {
13379+
"alertThreshold": true
13380+
},
13381+
"percentage": false,
13382+
"pluginVersion": "7.5.11",
13383+
"pointradius": 5,
13384+
"points": false,
13385+
"renderer": "flot",
13386+
"seriesOverrides": [],
13387+
"spaceLength": 10,
13388+
"stack": false,
13389+
"steppedLine": false,
13390+
"targets": [
13391+
{
13392+
"exemplar": true,
13393+
"expr": "sum(rate(tidb_tikvclient_stale_region_from_pd{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[30s]))",
13394+
"format": "time_series",
13395+
"interval": "",
13396+
"intervalFactor": 2,
13397+
"legendFormat": "all",
13398+
"refId": "A",
13399+
"step": 10
13400+
}
13401+
],
13402+
"thresholds": [],
13403+
"timeFrom": null,
13404+
"timeRegions": [],
13405+
"timeShift": null,
13406+
"title": "Stale Region From PD",
13407+
"tooltip": {
13408+
"msResolution": false,
13409+
"shared": true,
13410+
"sort": 0,
13411+
"value_type": "cumulative"
13412+
},
13413+
"type": "graph",
13414+
"xaxis": {
13415+
"buckets": null,
13416+
"mode": "time",
13417+
"name": null,
13418+
"show": true,
13419+
"values": []
13420+
},
13421+
"yaxes": [
13422+
{
13423+
"format": "ops",
13424+
"label": null,
13425+
"logBase": 1,
13426+
"max": null,
13427+
"min": "0",
13428+
"show": true
13429+
},
13430+
{
13431+
"format": "short",
13432+
"label": null,
13433+
"logBase": 1,
13434+
"max": null,
13435+
"min": null,
13436+
"show": true
13437+
}
13438+
],
13439+
"yaxis": {
13440+
"align": false,
13441+
"alignLevel": null
13442+
}
13443+
},
1333913444
{
1334013445
"aliasColors": {},
1334113446
"bars": false,

‎pkg/sessionctx/variable/tidb_vars.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1388,7 +1388,7 @@ const (
13881388
DefTiDBEnableLocalTxn = false
13891389
DefTiDBTSOClientBatchMaxWaitTime = 0.0 // 0ms
13901390
DefTiDBEnableTSOFollowerProxy = false
1391-
DefPDEnableFollowerHandleRegion = false
1391+
DefPDEnableFollowerHandleRegion = true
13921392
DefTiDBEnableOrderedResultMode = false
13931393
DefTiDBEnablePseudoForOutdatedStats = false
13941394
DefTiDBRegardNULLAsPoint = true

‎tests/integrationtest/r/session/vars.result

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@ select @@tidb_enable_tso_follower_proxy;
6464
0
6565
select @@pd_enable_follower_handle_region;
6666
@@pd_enable_follower_handle_region
67-
0
68-
set global pd_enable_follower_handle_region = on;
69-
select @@pd_enable_follower_handle_region;
70-
@@pd_enable_follower_handle_region
7167
1
7268
set global pd_enable_follower_handle_region = off;
7369
select @@pd_enable_follower_handle_region;
7470
@@pd_enable_follower_handle_region
7571
0
72+
set global pd_enable_follower_handle_region = on;
73+
select @@pd_enable_follower_handle_region;
74+
@@pd_enable_follower_handle_region
75+
1
7676
set tidb_tso_client_batch_max_wait_time = 0;
7777
Error 1229 (HY000): Variable 'tidb_tso_client_batch_max_wait_time' is a GLOBAL variable and should be set with SET GLOBAL
7878
set global tidb_enable_tso_follower_proxy = default;

‎tests/integrationtest/t/session/vars.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ select @@tidb_enable_tso_follower_proxy;
3636
set global tidb_enable_tso_follower_proxy = off;
3737
select @@tidb_enable_tso_follower_proxy;
3838
select @@pd_enable_follower_handle_region;
39-
set global pd_enable_follower_handle_region = on;
40-
select @@pd_enable_follower_handle_region;
4139
set global pd_enable_follower_handle_region = off;
4240
select @@pd_enable_follower_handle_region;
41+
set global pd_enable_follower_handle_region = on;
42+
select @@pd_enable_follower_handle_region;
4343
-- error 1229
4444
set tidb_tso_client_batch_max_wait_time = 0;
4545
set global tidb_enable_tso_follower_proxy = default;

0 commit comments

Comments
 (0)