This is an automated email from the ASF dual-hosted git repository.
spricoder pushed a commit to branch feature/optimize_memory
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/feature/optimize_memory by
this push:
new 37840351b28 rollback 2
37840351b28 is described below
commit 37840351b28a0c031df109f0ae53568510dfdd71
Author: spricoder <[email protected]>
AuthorDate: Thu Jan 9 20:16:18 2025 +0800
rollback 2
---
.../iotdb/db/service/metrics/WritingMetrics.java | 106 +++++++++++----------
1 file changed, 56 insertions(+), 50 deletions(-)
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/WritingMetrics.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/WritingMetrics.java
index 15238d4afa3..8820be02fa8 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/WritingMetrics.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/WritingMetrics.java
@@ -67,34 +67,37 @@ public class WritingMetrics implements IMetricSet {
flushStageSortTimer =
metricService.getOrCreateTimer(
Metric.FLUSH_COST.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.STAGE.toString(),
FLUSH_STAGE_SORT);
flushStageEncodingTimer =
metricService.getOrCreateTimer(
Metric.FLUSH_COST.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.STAGE.toString(),
FLUSH_STAGE_ENCODING);
flushStageIOTimer =
metricService.getOrCreateTimer(
- Metric.FLUSH_COST.toString(), MetricLevel.NORMAL,
Tag.STAGE.toString(), FLUSH_STAGE_IO);
+ Metric.FLUSH_COST.toString(),
+ MetricLevel.IMPORTANT,
+ Tag.STAGE.toString(),
+ FLUSH_STAGE_IO);
writePlanIndicesTimer =
metricService.getOrCreateTimer(
Metric.FLUSH_COST.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.STAGE.toString(),
WRITE_PLAN_INDICES);
metricService.createAutoGauge(
Metric.PENDING_FLUSH_TASK.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
FlushManager.getInstance(),
FlushManager::getNumberOfPendingTasks,
Tag.TYPE.toString(),
PENDING_TASK_NUM);
metricService.createAutoGauge(
Metric.PENDING_FLUSH_TASK.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
FlushManager.getInstance(),
FlushManager::getNumberOfPendingSubTasks,
Tag.TYPE.toString(),
@@ -136,19 +139,19 @@ public class WritingMetrics implements IMetricSet {
sortTaskTimer =
metricService.getOrCreateTimer(
Metric.FLUSH_SUB_TASK_COST.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.TYPE.toString(),
SORT_TASK);
encodingTaskTimer =
metricService.getOrCreateTimer(
Metric.FLUSH_SUB_TASK_COST.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.TYPE.toString(),
ENCODING_TASK);
ioTaskTimer =
metricService.getOrCreateTimer(
Metric.FLUSH_SUB_TASK_COST.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.TYPE.toString(),
IO_TASK);
}
@@ -197,70 +200,73 @@ public class WritingMetrics implements IMetricSet {
private void bindWALMetrics(AbstractMetricService metricService) {
metricService.createAutoGauge(
Metric.WAL_NODE_NUM.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
WAL_MANAGER,
WALManager::getWALNodesNum,
Tag.NAME.toString(),
WAL_NODES_NUM);
usedRatioHistogram =
metricService.getOrCreateHistogram(
- Metric.WAL_BUFFER.toString(), MetricLevel.NORMAL,
Tag.NAME.toString(), USED_RATIO);
+ Metric.WAL_BUFFER.toString(), MetricLevel.IMPORTANT,
Tag.NAME.toString(), USED_RATIO);
entriesCountHistogram =
metricService.getOrCreateHistogram(
- Metric.WAL_BUFFER.toString(), MetricLevel.NORMAL,
Tag.NAME.toString(), ENTRIES_COUNT);
+ Metric.WAL_BUFFER.toString(),
+ MetricLevel.IMPORTANT,
+ Tag.NAME.toString(),
+ ENTRIES_COUNT);
serializedWALBufferSizeHistogram =
metricService.getOrCreateHistogram(
Metric.WAL_BUFFER.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.NAME.toString(),
SERIALIZED_WAL_BUFFER_SIZE_BYTE);
wroteWALBufferSizeHistogram =
metricService.getOrCreateHistogram(
Metric.WAL_BUFFER.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.NAME.toString(),
WROTE_WAL_BUFFER_SIZE_BYTE);
walCompressCostHistogram =
metricService.getOrCreateHistogram(
Metric.WAL_BUFFER.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.NAME.toString(),
WAL_COMPRESS_COST_NS);
walUncompressCostHistogram =
metricService.getOrCreateHistogram(
Metric.WAL_BUFFER.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.NAME.toString(),
WAL_UNCOMPRESS_COST_NS);
readWALBufferSizeHistogram =
metricService.getOrCreateHistogram(
Metric.WAL_BUFFER.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.NAME.toString(),
READ_WAL_BUFFER_SIZE_BYTE);
readWALBufferCostHistogram =
metricService.getOrCreateHistogram(
Metric.WAL_BUFFER.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.NAME.toString(),
READ_WAL_BUFFER_COST_NS);
writeWALBufferCostHistogram =
metricService.getOrCreateHistogram(
Metric.WAL_BUFFER.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.NAME.toString(),
WRITE_WAL_BUFFER_COST_NS);
walQueueMaxMemSizeGauge =
metricService.getOrCreateGauge(
Metric.WAL_QUEUE_MEM_COST.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.NAME.toString(),
WAL_QUEUE_MAX_MEM_COST);
SystemInfo systemInfo = SystemInfo.getInstance();
metricService.createAutoGauge(
Metric.WAL_QUEUE_MEM_COST.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
systemInfo,
SystemInfo::getCurrentWalQueueMemoryCost,
Tag.NAME.toString(),
@@ -318,7 +324,7 @@ public class WritingMetrics implements IMetricSet {
globalMemoryTableInfoTimer =
metricService.getOrCreateTimer(
Metric.WAL_COST.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.STAGE.toString(),
MAKE_CHECKPOINT,
Tag.TYPE.toString(),
@@ -326,7 +332,7 @@ public class WritingMetrics implements IMetricSet {
createMemoryTableTimer =
metricService.getOrCreateTimer(
Metric.WAL_COST.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.STAGE.toString(),
MAKE_CHECKPOINT,
Tag.TYPE.toString(),
@@ -334,7 +340,7 @@ public class WritingMetrics implements IMetricSet {
flushMemoryTableTimer =
metricService.getOrCreateTimer(
Metric.WAL_COST.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.STAGE.toString(),
MAKE_CHECKPOINT,
Tag.TYPE.toString(),
@@ -342,7 +348,7 @@ public class WritingMetrics implements IMetricSet {
serializeWalEntryTotalTimer =
metricService.getOrCreateTimer(
Metric.WAL_COST.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.STAGE.toString(),
SERIALIZE_WAL_ENTRY,
Tag.TYPE.toString(),
@@ -350,7 +356,7 @@ public class WritingMetrics implements IMetricSet {
syncTimer =
metricService.getOrCreateTimer(
Metric.WAL_COST.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.STAGE.toString(),
SYNC_WAL_BUFFER,
Tag.TYPE.toString(),
@@ -358,7 +364,7 @@ public class WritingMetrics implements IMetricSet {
fsyncTimer =
metricService.getOrCreateTimer(
Metric.WAL_COST.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.STAGE.toString(),
SYNC_WAL_BUFFER,
Tag.TYPE.toString(),
@@ -459,20 +465,20 @@ public class WritingMetrics implements IMetricSet {
MetricService.getInstance()
.getOrCreateGauge(
Metric.MEMTABLE_THRESHOLD.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.TYPE.toString(),
FLUSH_THRESHOLD);
rejectThreholdGauge =
MetricService.getInstance()
.getOrCreateGauge(
Metric.MEMTABLE_THRESHOLD.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.TYPE.toString(),
REJECT_THRESHOLD);
memtableLiveTimer =
MetricService.getInstance()
- .getOrCreateTimer(Metric.MEMTABLE_LIVE_DURATION.toString(),
MetricLevel.NORMAL);
+ .getOrCreateTimer(Metric.MEMTABLE_LIVE_DURATION.toString(),
MetricLevel.IMPORTANT);
}
public void unbindDataRegionMetrics() {
@@ -535,7 +541,7 @@ public class WritingMetrics implements IMetricSet {
MetricService.getInstance()
.getOrCreateHistogram(
Metric.WAL_NODE_INFO.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.NAME.toString(),
name,
Tag.TYPE.toString(),
@@ -572,7 +578,7 @@ public class WritingMetrics implements IMetricSet {
MetricService.getInstance()
.getOrCreateHistogram(
Metric.FLUSHING_MEM_TABLE_STATUS.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.NAME.toString(),
name,
Tag.REGION.toString(),
@@ -583,7 +589,7 @@ public class WritingMetrics implements IMetricSet {
return MetricService.getInstance()
.getOrCreateCounter(
Metric.FLUSH_MEMTABLE_COUNT.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.TYPE.toString(),
WAL_FLUSH_MEMTABLE_COUNT);
}
@@ -592,7 +598,7 @@ public class WritingMetrics implements IMetricSet {
return MetricService.getInstance()
.getOrCreateCounter(
Metric.FLUSH_MEMTABLE_COUNT.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.TYPE.toString(),
TIMED_FLUSH_MEMTABLE_COUNT);
}
@@ -601,7 +607,7 @@ public class WritingMetrics implements IMetricSet {
return MetricService.getInstance()
.getOrCreateCounter(
Metric.FLUSH_MEMTABLE_COUNT.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.TYPE.toString(),
SERIES_FULL_FLUSH_MEMTABLE);
}
@@ -610,7 +616,7 @@ public class WritingMetrics implements IMetricSet {
return MetricService.getInstance()
.getOrCreateCounter(
Metric.FLUSH_MEMTABLE_COUNT.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.TYPE.toString(),
MANUAL_FLUSH_MEMTABLE_COUNT);
}
@@ -619,7 +625,7 @@ public class WritingMetrics implements IMetricSet {
return MetricService.getInstance()
.getOrCreateCounter(
Metric.FLUSH_MEMTABLE_COUNT.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.TYPE.toString(),
MEM_CONTROL_FLUSH_MEMTABLE_COUNT);
}
@@ -628,14 +634,14 @@ public class WritingMetrics implements IMetricSet {
MetricService.getInstance()
.getOrCreateCounter(
Metric.ACTIVE_MEMTABLE_COUNT.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.REGION.toString(),
dataRegionId.toString());
}
public void createActiveTimePartitionCounterMetrics() {
MetricService.getInstance()
- .getOrCreateCounter(Metric.ACTIVE_TIME_PARTITION_COUNT.toString(),
MetricLevel.NORMAL);
+ .getOrCreateCounter(Metric.ACTIVE_TIME_PARTITION_COUNT.toString(),
MetricLevel.IMPORTANT);
}
public void removeSeriesFullFlushMemTableCounterMetrics() {
@@ -722,7 +728,7 @@ public class WritingMetrics implements IMetricSet {
.histogram(
(long) (ratio * 100),
Metric.WAL_NODE_INFO.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.NAME.toString(),
EFFECTIVE_RATIO_INFO,
Tag.TYPE.toString(),
@@ -734,7 +740,7 @@ public class WritingMetrics implements IMetricSet {
.histogram(
ram,
Metric.WAL_NODE_INFO.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.NAME.toString(),
OLDEST_MEM_TABLE_RAM_WHEN_CAUSE_SNAPSHOT,
Tag.TYPE.toString(),
@@ -746,7 +752,7 @@ public class WritingMetrics implements IMetricSet {
.histogram(
ram,
Metric.WAL_NODE_INFO.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.NAME.toString(),
OLDEST_MEM_TABLE_RAM_WHEN_CAUSE_FLUSH,
Tag.TYPE.toString(),
@@ -759,7 +765,7 @@ public class WritingMetrics implements IMetricSet {
.histogram(
(long) (compressionRatio * 100),
Metric.FLUSHING_MEM_TABLE_STATUS.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.NAME.toString(),
COMPRESSION_RATIO,
Tag.REGION.toString(),
@@ -777,7 +783,7 @@ public class WritingMetrics implements IMetricSet {
.histogram(
memSize,
Metric.FLUSHING_MEM_TABLE_STATUS.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.NAME.toString(),
MEM_TABLE_SIZE,
Tag.REGION.toString(),
@@ -786,7 +792,7 @@ public class WritingMetrics implements IMetricSet {
.histogram(
seriesNum,
Metric.FLUSHING_MEM_TABLE_STATUS.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.NAME.toString(),
SERIES_NUM,
Tag.REGION.toString(),
@@ -795,7 +801,7 @@ public class WritingMetrics implements IMetricSet {
.histogram(
totalPointsNum,
Metric.FLUSHING_MEM_TABLE_STATUS.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.NAME.toString(),
POINTS_NUM,
Tag.REGION.toString(),
@@ -804,7 +810,7 @@ public class WritingMetrics implements IMetricSet {
.histogram(
avgSeriesNum,
Metric.FLUSHING_MEM_TABLE_STATUS.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.NAME.toString(),
AVG_SERIES_POINT_NUM,
Tag.REGION.toString(),
@@ -820,7 +826,7 @@ public class WritingMetrics implements IMetricSet {
.histogram(
size,
Metric.FLUSHING_MEM_TABLE_STATUS.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.NAME.toString(),
FLUSH_TSFILE_SIZE,
Tag.REGION.toString(),
@@ -972,14 +978,14 @@ public class WritingMetrics implements IMetricSet {
.count(
number,
Metric.ACTIVE_MEMTABLE_COUNT.toString(),
- MetricLevel.NORMAL,
+ MetricLevel.IMPORTANT,
Tag.REGION.toString(),
dataRegionId);
}
public void recordActiveTimePartitionCount(int number) {
MetricService.getInstance()
- .count(number, Metric.ACTIVE_TIME_PARTITION_COUNT.toString(),
MetricLevel.NORMAL);
+ .count(number, Metric.ACTIVE_TIME_PARTITION_COUNT.toString(),
MetricLevel.IMPORTANT);
}
// endregion
