Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

*: update tikv/client-go and fix stale read metrics in grafana #45505

Merged
merged 6 commits into from
Jul 24, 2023
Merged

*: update tikv/client-go and fix stale read metrics in grafana #45505

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2404a46
*: update tikv/client-go and fix stale read metrics in grafana
crazycs520 Jul 21, 2023
9edf2fb
update
hawkingrei Jul 21, 2023
6d6e9a6
update
hawkingrei Jul 21, 2023
5067370
Merge branch 'master' of https://github.com/pingcap/tidb into fix-sta…
crazycs520 Jul 24, 2023
929a51f
tiny fix
crazycs520 Jul 24, 2023
5cf47ce
go mod tidy
crazycs520 Jul 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions DEPS.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6924,13 +6924,13 @@ def go_deps():
name = "com_github_tikv_client_go_v2",
build_file_proto_mode = "disable_global",
importpath = "github.com/tikv/client-go/v2",
sha256 = "823bf64202c4d63c3994b565cf0bf16afd31e4264da10b6a8fa9a6f3b0671e61",
strip_prefix = "github.com/tikv/client-go/v2@v2.0.8-0.20230714023607-2f119351bd5c",
sha256 = "fda64379a1d2f8bc263aa1e9faac235a59c085bc06269a46a88f3dd60e37d372",
strip_prefix = "github.com/tikv/client-go/v2@v2.0.8-0.20230714052714-85fc8f337565",
urls = [
"http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20230714023607-2f119351bd5c.zip",
"http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20230714023607-2f119351bd5c.zip",
"https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20230714023607-2f119351bd5c.zip",
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20230714023607-2f119351bd5c.zip",
"http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20230714052714-85fc8f337565.zip",
"http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20230714052714-85fc8f337565.zip",
"https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20230714052714-85fc8f337565.zip",
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20230714052714-85fc8f337565.zip",
],
)
go_repository(
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ require (
github.com/stretchr/testify v1.8.4
github.com/tdakkota/asciicheck v0.2.0
github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2
github.com/tikv/client-go/v2 v2.0.8-0.20230714023607-2f119351bd5c
github.com/tikv/client-go/v2 v2.0.8-0.20230714052714-85fc8f337565
github.com/tikv/pd/client v0.0.0-20230613052906-7158cb319935
github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966
github.com/twmb/murmur3 v1.1.6
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,6 +995,8 @@ github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a h1:J/YdBZ46WKpXsxsW
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a/go.mod h1:h4xBhSNtOeEosLJ4P7JyKXX7Cabg7AVkWCK5gV2vOrM=
github.com/tikv/client-go/v2 v2.0.8-0.20230714023607-2f119351bd5c h1:88oApJuTK/WiBnBw9cV+AgA20pNZVtVIyeh8fTm2ymo=
github.com/tikv/client-go/v2 v2.0.8-0.20230714023607-2f119351bd5c/go.mod h1:4KkKqjJgKlvvWMyNqdnAlYFfV4QjEj1fEb5Hb/FoT88=
github.com/tikv/client-go/v2 v2.0.8-0.20230714052714-85fc8f337565 h1:aD1hoGTdd/z5BmEpt9NctVlpf0OnyLVCdoPVQnguNI8=
github.com/tikv/client-go/v2 v2.0.8-0.20230714052714-85fc8f337565/go.mod h1:4KkKqjJgKlvvWMyNqdnAlYFfV4QjEj1fEb5Hb/FoT88=
github.com/tikv/pd/client v0.0.0-20230613052906-7158cb319935 h1:a5SATBxu/0Z6qNnz4KXDN91gDA06waaYcHM6dkb6lz4=
github.com/tikv/pd/client v0.0.0-20230613052906-7158cb319935/go.mod h1:YmNkj9UT8IjwFov9k3oquH0UgIUHniUaQT3jXKgZYbM=
github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 h1:quvGphlmUVU+nhpFa4gg4yJyTRJ13reZMDHrKwYw53M=
Expand Down
147 changes: 128 additions & 19 deletions metrics/grafana/tidb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10454,18 +10454,20 @@
"h": 7,
"w": 8,
"x": 0,
"y": 50
"y": 29
},
"hiddenSeries": false,
"id": 306,
"legend": {
"avg": false,
"current": false,
"max": false,
"alignAsTable": true,
"avg": true,
"current": true,
"max": true,
"min": false,
"rightSide": true,
"show": true,
"total": false,
"values": false
"values": true
},
"lines": true,
"linewidth": 1,
Expand All @@ -10486,7 +10488,7 @@
"targets": [
{
"exemplar": true,
"expr": "sum(rate(tidb_tikvclient_stale_read_bytes_count{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", direction=\"in\"}[1m])) by (result)",
"expr": "sum(rate(tidb_tikvclient_stale_read_counter{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])) by (result)",
"format": "time_series",
"interval": "",
"intervalFactor": 2,
Expand All @@ -10499,7 +10501,7 @@
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Stale Read OPS",
"title": "Stale Read Hit/Miss OPS",
"tooltip": {
"shared": true,
"sort": 0,
Expand Down Expand Up @@ -10542,7 +10544,7 @@
"dashLength": 10,
"dashes": false,
"datasource": "${DS_TEST-CLUSTER}",
"description": "TiDB hit/miss stale-read traffic statistic",
"description": "TiDB stale-read requests count",
"fieldConfig": {
"defaults": {},
"overrides": []
Expand All @@ -10553,18 +10555,124 @@
"h": 7,
"w": 8,
"x": 8,
"y": 50
"y": 29
},
"hiddenSeries": false,
"id": 307,
"legend": {
"avg": false,
"current": false,
"max": false,
"alignAsTable": true,
"avg": true,
"current": true,
"max": true,
"min": false,
"rightSide": true,
"show": true,
"total": false,
"values": false
"values": true
},
"lines": true,
"linewidth": 1,
"links": [],
"nullPointMode": "null",
"options": {
"alertThreshold": true
},
"percentage": false,
"pluginVersion": "7.5.11",
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"exemplar": true,
"expr": "sum(rate(tidb_tikvclient_stale_read_req_counter{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])) by (type)",
"format": "time_series",
"hide": false,
"interval": "",
"intervalFactor": 2,
"legendFormat": "{{type}}",
"refId": "A",
"step": 30
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Stale Read Req OPS",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"$$hashKey": "object:240",
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"$$hashKey": "object:241",
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "${DS_TEST-CLUSTER}",
"description": "TiDB stale-read requests traffic statistic",
"fieldConfig": {
"defaults": {},
"overrides": []
},
"fill": 1,
"fillGradient": 0,
"gridPos": {
"h": 7,
"w": 8,
"x": 16,
"y": 29
},
"hiddenSeries": false,
"id": 308,
"legend": {
"alignAsTable": true,
"avg": true,
"current": true,
"max": true,
"min": false,
"rightSide": true,
"show": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 1,
Expand All @@ -10585,8 +10693,9 @@
"targets": [
{
"exemplar": true,
"expr": "sum(rate(tidb_tikvclient_stale_read_bytes_sum{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])) by (result, direction)",
"expr": "sum(rate(tidb_tikvclient_stale_read_bytes{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])) by (result, direction)",
"format": "time_series",
"hide": false,
"interval": "",
"intervalFactor": 2,
"legendFormat": "{{result}}-{{direction}}",
Expand All @@ -10598,7 +10707,7 @@
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Stale Read Traffic",
"title": "Stale Read Req Traffic",
"tooltip": {
"shared": true,
"sort": 0,
Expand All @@ -10614,7 +10723,7 @@
},
"yaxes": [
{
"$$hashKey": "object:156",
"$$hashKey": "object:327",
"format": "Bps",
"label": null,
"logBase": 1,
Expand All @@ -10623,13 +10732,13 @@
"show": true
},
{
"$$hashKey": "object:157",
"format": "short",
"$$hashKey": "object:328",
"format": "Bps",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": false
"show": true
}
],
"yaxis": {
Expand Down