Skip to content

Commit

Permalink
Merge branch 'master' into bind_delta_merge_storage_with_executor_ut
Browse files Browse the repository at this point in the history
  • Loading branch information
@ywqzzy
ywqzzy authored Jan 3, 2023
2 parents 59fd171 + fb8f11f commit b67b85a
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 25 deletions.
6 changes: 1 addition & 5 deletions dbms/src/Common/TiFlashMetrics.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,7 @@ namespace DB
F(reason_other_error, {"reason", "other_error"})) \
M(tiflash_coprocessor_request_handle_seconds, "Bucketed histogram of request handle duration", Histogram, \
F(type_cop, {{"type", "cop"}}, ExpBuckets{0.001, 2, 20}), \
F(type_batch, {{"type", "batch"}}, ExpBuckets{0.001, 2, 20}), \
F(type_dispatch_mpp_task, {{"type", "dispatch_mpp_task"}}, ExpBuckets{0.001, 2, 20}), \
F(type_mpp_establish_conn, {{"type", "mpp_establish_conn"}}, ExpBuckets{0.001, 2, 20}), \
F(type_cancel_mpp_task, {{"type", "cancel_mpp_task"}}, ExpBuckets{0.001, 2, 20}), \
F(type_run_mpp_task, {{"type", "run_mpp_task"}}, ExpBuckets{0.001, 2, 20})) \
F(type_batch, {{"type", "batch"}}, ExpBuckets{0.001, 2, 20})) \
M(tiflash_coprocessor_response_bytes, "Total bytes of response body", Counter, \
F(type_cop, {{"type", "cop"}}), \
F(type_batch_cop, {{"type", "batch_cop"}}), \
Expand Down
3 changes: 2 additions & 1 deletion dbms/src/Core/Block.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -543,8 +543,9 @@ Block mergeBlocks(Blocks && blocks)

for (size_t i = 1; i < blocks.size(); ++i)
{
if (likely(blocks[i].rows()) > 0)
if (likely(blocks[i].rows() > 0))
{
assert(blocksHaveEqualStructure(first_block, blocks[i]));
for (size_t column = 0; column < blocks[i].columns(); ++column)
{
dst_columns[column]->insertRangeFrom(*blocks[i].getByPosition(column).column, 0, blocks[i].rows());
Expand Down
41 changes: 22 additions & 19 deletions metrics/grafana/tiflash_summary.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2868,32 +2868,35 @@
"steppedLine": false,
"targets": [
{
"expr": "histogram_quantile(0.999, sum(rate(tiflash_coprocessor_request_duration_seconds_bucket{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])) by (le))",
"expr": "histogram_quantile(0.999, sum(rate(tiflash_coprocessor_request_duration_seconds_bucket{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])) by (le, type))",
"format": "time_series",
"intervalFactor": 1,
"legendFormat": "999",
"legendFormat": "999-{{type}}",
"refId": "A"
},
{
"expr": "histogram_quantile(0.99, sum(rate(tiflash_coprocessor_request_duration_seconds_bucket{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])) by (le))",
"expr": "histogram_quantile(0.99, sum(rate(tiflash_coprocessor_request_duration_seconds_bucket{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])) by (le, type))",
"format": "time_series",
"intervalFactor": 1,
"legendFormat": "99",
"refId": "B"
"legendFormat": "99-{{type}}",
"refId": "B",
"hide": true
},
{
"expr": "histogram_quantile(0.95, sum(rate(tiflash_coprocessor_request_duration_seconds_bucket{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])) by (le))",
"expr": "histogram_quantile(0.95, sum(rate(tiflash_coprocessor_request_duration_seconds_bucket{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])) by (le, type))",
"format": "time_series",
"intervalFactor": 1,
"legendFormat": "95",
"refId": "C"
"legendFormat": "95-{{type}}",
"refId": "C",
"hide": true
},
{
"expr": "histogram_quantile(0.80, sum(rate(tiflash_coprocessor_request_duration_seconds_bucket{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])) by (le))",
"expr": "histogram_quantile(0.80, sum(rate(tiflash_coprocessor_request_duration_seconds_bucket{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])) by (le, type))",
"format": "time_series",
"intervalFactor": 1,
"legendFormat": "80",
"refId": "D"
"legendFormat": "80-{{type}}",
"refId": "D",
"hide": true
}
],
"thresholds": [],
Expand Down Expand Up @@ -3083,31 +3086,31 @@
"steppedLine": false,
"targets": [
{
"expr": "histogram_quantile(0.999, sum(rate(tiflash_coprocessor_request_handle_seconds_bucket{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])) by (le))",
"expr": "histogram_quantile(0.999, sum(rate(tiflash_coprocessor_request_handle_seconds_bucket{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])) by (le, type))",
"format": "time_series",
"intervalFactor": 1,
"legendFormat": "999",
"legendFormat": "999-{{type}}",
"refId": "A"
},
{
"expr": "histogram_quantile(0.99, sum(rate(tiflash_coprocessor_request_handle_seconds_bucket{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])) by (le))",
"expr": "histogram_quantile(0.99, sum(rate(tiflash_coprocessor_request_handle_seconds_bucket{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])) by (le, type))",
"format": "time_series",
"intervalFactor": 1,
"legendFormat": "99",
"legendFormat": "99-{{type}}",
"refId": "B"
},
{
"expr": "histogram_quantile(0.95, sum(rate(tiflash_coprocessor_request_handle_seconds_bucket{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])) by (le))",
"expr": "histogram_quantile(0.95, sum(rate(tiflash_coprocessor_request_handle_seconds_bucket{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])) by (le, type))",
"format": "time_series",
"intervalFactor": 1,
"legendFormat": "95",
"legendFormat": "95-{{type}}",
"refId": "C"
},
{
"expr": "histogram_quantile(0.80, sum(rate(tiflash_coprocessor_request_handle_seconds_bucket{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])) by (le))",
"expr": "histogram_quantile(0.80, sum(rate(tiflash_coprocessor_request_handle_seconds_bucket{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])) by (le, type))",
"format": "time_series",
"intervalFactor": 1,
"legendFormat": "80",
"legendFormat": "80-{{type}}",
"refId": "D"
}
],
Expand Down

0 comments on commit b67b85a

Please sign in to comment.