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

KVStore: More metrics for Prehandling #9131

Merged
merged 2 commits into from
Jun 7, 2024
Merged

KVStore: More metrics for Prehandling #9131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aeb1965
a
CalvinNeo Jun 7, 2024
12ca54a
a
CalvinNeo Jun 7, 2024
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
5 changes: 5 additions & 0 deletions dbms/src/Common/TiFlashMetrics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,10 @@ static_assert(RAFT_REGION_BIG_WRITE_THRES * 4 < RAFT_REGION_BIG_WRITE_MAX, "Inva
F(type_total, {{"type", "total"}}, ExpBucketsWithRange{0.2, 4, 300}), \
F(type_queue_stage, {{"type", "queue_stage"}}, ExpBucketsWithRange{0.2, 4, 300}), \
F(type_phase1_total, {{"type", "phase1_total"}}, ExpBucketsWithRange{0.2, 4, 300})) \
M(tiflash_raft_command_throughput, \
"", \
Histogram, \
F(type_prehandle_snapshot, {{"type", "prehandle_snapshot"}}, ExpBuckets{128, 2, 11})) \
M(tiflash_raft_command_duration_seconds, \
"Bucketed histogram of some raft command: apply snapshot and ingest SST", \
Histogram, /* these command usually cost several seconds, increase the start bucket to 50ms */ \
Expand Down Expand Up @@ -496,6 +500,7 @@ static_assert(RAFT_REGION_BIG_WRITE_THRES * 4 < RAFT_REGION_BIG_WRITE_MAX, "Inva
F(type_flush_log_gap, {{"type", "flush_log_gap"}}), \
F(type_flush_size, {{"type", "flush_size"}}), \
F(type_flush_rowcount, {{"type", "flush_rowcount"}}), \
F(type_prehandle, {{"type", "prehandle"}}), \
F(type_flush_eager_gc, {{"type", "flush_eager_gc"}})) \
M(tiflash_raft_raft_frequent_events_count, \
"Raft frequent event counter", \
Expand Down
6 changes: 6 additions & 0 deletions dbms/src/Storages/KVStore/MultiRaft/PrehandleSnapshot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ static inline std::tuple<ReadFromStreamResult, PrehandleResult> executeTransform
trace.releaseSubtaskResources(region_id, split_id);
CurrentMetrics::sub(CurrentMetrics::RaftNumPrehandlingSubTasks);
});
Stopwatch sw;
LOG_INFO(
log,
"Add prehandle task split_id={} limit={}",
Expand Down Expand Up @@ -200,6 +201,10 @@ static inline std::tuple<ReadFromStreamResult, PrehandleResult> executeTransform
stream->cancel();
res = ReadFromStreamResult{.error = abort_reason.value(), .extra_msg = "", .region = new_region};
}
auto keys_per_second = (sst_stream->getProcessKeys().write_cf + sst_stream->getProcessKeys().lock_cf
+ sst_stream->getProcessKeys().write_cf)
* 1.0 / sw.elapsedSeconds();
GET_METRIC(tiflash_raft_command_throughput, type_prehandle_snapshot).Observe(keys_per_second);
return std::make_pair(
std::move(res),
PrehandleResult{
Expand Down Expand Up @@ -254,6 +259,7 @@ PrehandleResult KVStore::preHandleSnapshotToFiles(
std::optional<uint64_t> deadline_index,
TMTContext & tmt)
{
GET_METRIC(tiflash_raft_raft_events_count, type_prehandle).Increment();
new_region->beforePrehandleSnapshot(new_region->id(), deadline_index);

ongoing_prehandle_task_count.fetch_add(1);
Expand Down
74 changes: 73 additions & 1 deletion metrics/grafana/tiflash_summary.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"gnetId": null,
"graphTooltip": 1,
"id": null,
"iteration": 1716350266980,
"iteration": 1717744619239,
"links": [],
"panels": [
{
Expand Down Expand Up @@ -13721,6 +13721,78 @@
"alignLevel": null
}
},
{
"cards": {
"cardPadding": null,
"cardRound": null
},
"color": {
"cardColor": "#b4ff00",
"colorScale": "sqrt",
"colorScheme": "interpolateSpectral",
"exponent": 0.5,
"min": 0,
"mode": "spectrum"
},
"dataFormat": "tsbuckets",
"datasource": "${DS_TEST-CLUSTER}",
"description": "",
"fieldConfig": {
"defaults": {},
"overrides": []
},
"gridPos": {
"h": 7,
"w": 12,
"x": 0,
"y": 121
},
"heatmap": {},
"hideZeroBuckets": true,
"highlightCards": true,
"id": 290,
"legend": {
"show": true
},
"links": [],
"reverseYBuckets": false,
"targets": [
{
"exemplar": true,
"expr": "sum(delta(tiflash_raft_command_throughput_seconds_bucket{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", type=\"prehandle_snapshot\"}[1m])) by (le)",
"format": "heatmap",
"interval": "",
"intervalFactor": 2,
"legendFormat": "{{le}}",
"refId": "B"
}
],
"timeFrom": null,
"timeShift": null,
"title": "Snapshot Prehandle Throughput Heatmap",
"tooltip": {
"show": true,
"showHistogram": true
},
"type": "heatmap",
"xAxis": {
"show": true
},
"xBucketNumber": null,
"xBucketSize": null,
"yAxis": {
"decimals": 0,
"format": "bytes",
"logBase": 1,
"max": null,
"min": null,
"show": true,
"splitFactor": null
},
"yBucketBound": "upper",
"yBucketNumber": null,
"yBucketSize": null
},
{
"cards": {
"cardPadding": null,
Expand Down