Skip to content

Commit

Permalink
Merge branch 'master' into fix_ps_v3
Browse files Browse the repository at this point in the history
  • Loading branch information
@JaySon-Huang
JaySon-Huang authored Mar 14, 2022
2 parents 801ea76 + eef6342 commit e014bc2
Show file tree
Hide file tree
Showing 2 changed files with 82 additions and 12 deletions.
4 changes: 2 additions & 2 deletions dbms/src/Interpreters/Settings.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,8 @@ struct Settings
M(SettingUInt64, dt_segment_delta_small_column_file_size, 8388608, "Determine whether a column file in delta is small or not. 8MB by default.") \
M(SettingUInt64, dt_segment_stable_pack_rows, DEFAULT_MERGE_BLOCK_SIZE, "Expected stable pack rows in DeltaTree Engine.") \
M(SettingFloat, dt_segment_wait_duration_factor, 1, "The factor of wait duration in a write stall.") \
M(SettingUInt64, dt_bg_gc_check_interval, 600, "Background gc thread check interval, the unit is second.") \
M(SettingInt64, dt_bg_gc_max_segments_to_check_every_round, 15, "Max segments to check in every gc round, value less than or equal to 0 means gc no segments.") \
M(SettingUInt64, dt_bg_gc_check_interval, 5, "Background gc thread check interval, the unit is second.") \
M(SettingInt64, dt_bg_gc_max_segments_to_check_every_round, 100, "Max segments to check in every gc round, value less than or equal to 0 means gc no segments.") \
M(SettingFloat, dt_bg_gc_ratio_threhold_to_trigger_gc, 1.2, "Trigger segment's gc when the ratio of invalid version exceed this threhold. Values smaller than or equal to 1.0 means gc all " \
"segments") \
M(SettingFloat, dt_bg_gc_delta_delete_ratio_to_trigger_gc, 0.3, "Trigger segment's gc when the ratio of delta delete range to stable exceeds this ratio.") \
Expand Down
90 changes: 80 additions & 10 deletions metrics/grafana/tiflash_summary.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"type": "grafana",
"id": "grafana",
"name": "Grafana",
"version": "6.1.6"
"version": "7.5.11"
},
{
"type": "panel",
Expand Down Expand Up @@ -52,11 +52,12 @@
"gnetId": null,
"graphTooltip": 1,
"id": null,
"iteration": 1631518930264,
"iteration": 1647230387563,
"links": [],
"panels": [
{
"collapsed": true,
"datasource": null,
"gridPos": {
"h": 1,
"w": 24,
Expand Down Expand Up @@ -1035,6 +1036,7 @@
},
{
"collapsed": true,
"datasource": null,
"gridPos": {
"h": 1,
"w": 24,
Expand Down Expand Up @@ -2205,6 +2207,7 @@
},
{
"collapsed": true,
"datasource": null,
"gridPos": {
"h": 1,
"w": 24,
Expand Down Expand Up @@ -2637,6 +2640,7 @@
},
{
"collapsed": true,
"datasource": null,
"gridPos": {
"h": 1,
"w": 24,
Expand Down Expand Up @@ -4467,6 +4471,7 @@
},
{
"collapsed": true,
"datasource": null,
"gridPos": {
"h": 1,
"w": 24,
Expand All @@ -4483,14 +4488,20 @@
"datasource": "${DS_TEST-CLUSTER}",
"decimals": 1,
"description": "The throughput of write and delta's background management",
"fieldConfig": {
"defaults": {},
"overrides": []
},
"fill": 1,
"fillGradient": 0,
"gridPos": {
"h": 9,
"w": 24,
"x": 0,
"y": 5
},
"height": "",
"hiddenSeries": false,
"id": 70,
"legend": {
"alignAsTable": true,
Expand All @@ -4512,7 +4523,11 @@
"linewidth": 1,
"links": [],
"nullPointMode": "null",
"options": {
"alertThreshold": true
},
"percentage": false,
"pluginVersion": "7.5.11",
"pointradius": 5,
"points": false,
"renderer": "flot",
Expand All @@ -4528,11 +4543,13 @@
"steppedLine": false,
"targets": [
{
"exemplar": true,
"expr": "sum(rate(tiflash_storage_throughput_bytes{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", type=~\"write|ingest\"}[1m]))",
"format": "time_series",
"hide": false,
"interval": "",
"intervalFactor": 1,
"legendFormat": "throughput_write",
"legendFormat": "throughput_write+ingest",
"refId": "A",
"step": 10
},
Expand All @@ -4544,10 +4561,12 @@
"refId": "B"
},
{
"exemplar": true,
"expr": "sum(tiflash_storage_throughput_bytes{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", type=~\"write|ingest\"})",
"format": "time_series",
"interval": "",
"intervalFactor": 1,
"legendFormat": "total_write",
"legendFormat": "total_write+ingest",
"refId": "C"
},
{
Expand Down Expand Up @@ -4606,13 +4625,19 @@
"dashes": false,
"datasource": "${DS_TEST-CLUSTER}",
"description": "The stall duration of write and delete range",
"fieldConfig": {
"defaults": {},
"overrides": []
},
"fill": 1,
"fillGradient": 0,
"gridPos": {
"h": 8,
"w": 24,
"x": 0,
"y": 14
},
"hiddenSeries": false,
"id": 62,
"legend": {
"alignAsTable": true,
Expand All @@ -4629,7 +4654,11 @@
"linewidth": 1,
"links": [],
"nullPointMode": "null as zero",
"options": {
"alertThreshold": true
},
"percentage": false,
"pluginVersion": "7.5.11",
"pointradius": 5,
"points": false,
"renderer": "flot",
Expand Down Expand Up @@ -4708,14 +4737,20 @@
"datasource": "${DS_TEST-CLUSTER}",
"decimals": 1,
"description": "The throughput of write by instance",
"fieldConfig": {
"defaults": {},
"overrides": []
},
"fill": 1,
"fillGradient": 0,
"gridPos": {
"h": 9,
"w": 24,
"x": 0,
"y": 22
},
"height": "",
"hiddenSeries": false,
"id": 89,
"legend": {
"alignAsTable": true,
Expand All @@ -4737,7 +4772,11 @@
"linewidth": 1,
"links": [],
"nullPointMode": "null",
"options": {
"alertThreshold": true
},
"percentage": false,
"pluginVersion": "7.5.11",
"pointradius": 5,
"points": false,
"renderer": "flot",
Expand All @@ -4753,13 +4792,23 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(rate(tiflash_storage_throughput_bytes{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", type=~\"write|ingest\"}[1m])) by (instance)",
"exemplar": true,
"expr": "sum(rate(tiflash_storage_throughput_bytes{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", type=~\"write\"}[1m])) by (instance)",
"format": "time_series",
"hide": false,
"interval": "",
"intervalFactor": 1,
"legendFormat": "throughput_write-{{instance}}",
"refId": "A",
"step": 10
},
{
"exemplar": true,
"expr": "sum(rate(tiflash_storage_throughput_bytes{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", type=~\"ingest\"}[1m])) by (instance)",
"hide": false,
"interval": "",
"legendFormat": "throughput_ingest-{{instance}}",
"refId": "B"
}
],
"thresholds": [],
Expand Down Expand Up @@ -4810,13 +4859,19 @@
"dashes": false,
"datasource": "${DS_TEST-CLUSTER}",
"description": "The total count of different kinds of commands received",
"fieldConfig": {
"defaults": {},
"overrides": []
},
"fill": 0,
"fillGradient": 0,
"gridPos": {
"h": 9,
"w": 24,
"x": 0,
"y": 31
},
"hiddenSeries": false,
"id": 90,
"legend": {
"alignAsTable": true,
Expand All @@ -4833,7 +4888,11 @@
"linewidth": 1,
"links": [],
"nullPointMode": "null as zero",
"options": {
"alertThreshold": true
},
"percentage": false,
"pluginVersion": "7.5.11",
"pointradius": 5,
"points": false,
"renderer": "flot",
Expand Down Expand Up @@ -4912,6 +4971,7 @@
},
{
"collapsed": true,
"datasource": null,
"gridPos": {
"h": 1,
"w": 24,
Expand Down Expand Up @@ -6222,6 +6282,7 @@
},
{
"collapsed": true,
"datasource": null,
"gridPos": {
"h": 1,
"w": 24,
Expand Down Expand Up @@ -6450,8 +6511,8 @@
"type": "row"
}
],
"refresh": "30s",
"schemaVersion": 18,
"refresh": false,
"schemaVersion": 27,
"style": "dark",
"tags": [],
"templating": {
Expand All @@ -6469,7 +6530,10 @@
"multi": false,
"name": "k8s_cluster",
"options": [],
"query": "label_values(tiflash_system_profile_event_Query, k8s_cluster)",
"query": {
"query": "label_values(tiflash_system_profile_event_Query, k8s_cluster)",
"refId": "j2-k8s_cluster-Variable-Query"
},
"refresh": 2,
"regex": "",
"skipUrlSync": false,
Expand All @@ -6493,7 +6557,10 @@
"multi": false,
"name": "tidb_cluster",
"options": [],
"query": "label_values(tiflash_system_profile_event_Query{k8s_cluster=\"$k8s_cluster\"}, tidb_cluster)",
"query": {
"query": "label_values(tiflash_system_profile_event_Query{k8s_cluster=\"$k8s_cluster\"}, tidb_cluster)",
"refId": "j2-tidb_cluster-Variable-Query"
},
"refresh": 2,
"regex": "",
"skipUrlSync": false,
Expand All @@ -6517,7 +6584,10 @@
"multi": true,
"name": "instance",
"options": [],
"query": "label_values(tiflash_system_profile_event_Query{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\"}, instance)",
"query": {
"query": "label_values(tiflash_system_profile_event_Query{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\"}, instance)",
"refId": "j2-instance-Variable-Query"
},
"refresh": 1,
"regex": "",
"skipUrlSync": false,
Expand Down

0 comments on commit e014bc2

Please sign in to comment.