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.

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

Add Memory Threshold #14597

Merged
merged 44 commits into from
Jan 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
a4a0e29
fix memory concurrency problem
SpriCoder Jul 22, 2024
8302be7
Merge branch 'master' into feature/optimize_memory
SpriCoder Jul 22, 2024
f4f65e4
merge
SpriCoder Dec 25, 2024
4e3fa96
Merge branch 'master' into feature/optimize_memory
SpriCoder Dec 26, 2024
7307bc5
add memory related metric name and tag
SpriCoder Dec 26, 2024
b5d88a6
add memory threshold code
SpriCoder Dec 26, 2024
05b0757
add total
SpriCoder Dec 27, 2024
4a4092d
Merge branch 'master' into feature/optimize_memory
SpriCoder Dec 28, 2024
01ad415
add part of write metrics
SpriCoder Dec 30, 2024
d019c60
remove hard string code
SpriCoder Dec 30, 2024
b97b406
fix error code(set storage engine size to schema engine
SpriCoder Dec 30, 2024
57d529b
degrade metric level
SpriCoder Dec 30, 2024
1d23592
fix error level
SpriCoder Dec 30, 2024
44adcdb
fix error type and add datanode device path cache
SpriCoder Dec 30, 2024
713e39b
finish write part
SpriCoder Dec 30, 2024
a093a1c
fix format
SpriCoder Dec 30, 2024
79e7a9e
fix name bug
SpriCoder Dec 30, 2024
2a4c275
move buffer pool to memtable
SpriCoder Dec 30, 2024
e06cd79
Merge branch 'master' into feature/optimize_memory
SpriCoder Jan 2, 2025
8fc262d
fix comment
SpriCoder Jan 2, 2025
deadee7
Merge branch 'master' into feature/optimize_memory
SpriCoder Jan 2, 2025
2de1a03
optimize the code
SpriCoder Jan 3, 2025
81665bc
Merge branch 'master' into feature/optimize_memory
SpriCoder Jan 3, 2025
4f1db4e
add Query Memory Threshold(level=2)
SpriCoder Jan 3, 2025
3fa6088
add Schema Memory Threshold(level=2)
SpriCoder Jan 3, 2025
e0ce0af
add Schema Memory Threshold(update comment)
SpriCoder Jan 3, 2025
468e1c9
move Consensus memory threshold
SpriCoder Jan 3, 2025
d26cc05
move Consensus memory threshold
SpriCoder Jan 3, 2025
3273bff
split class to optimize code
SpriCoder Jan 3, 2025
5d17be6
Add Off Heap Memory Total
SpriCoder Jan 3, 2025
6442813
Merge branch 'master' into feature/optimize_memory
SpriCoder Jan 6, 2025
9bcfe05
Merge branch 'master' into feature/optimize_memory
SpriCoder Jan 6, 2025
9bf1bc8
change metric name
SpriCoder Jan 6, 2025
ba88514
add Metric memory_actual_size
SpriCoder Jan 6, 2025
a9a0030
Merge branch 'master' into feature/optimize_memory
SpriCoder Jan 8, 2025
7c4aeb9
init first version of memory manager and memory block
SpriCoder Jan 8, 2025
cc89021
add IIoTDBMemoryBlock
SpriCoder Jan 8, 2025
e33d234
fix template
SpriCoder Jan 8, 2025
bbd4383
Merge branch 'master' into feature/optimize_memory
SpriCoder Jan 9, 2025
dbbfc5f
rollback
SpriCoder Jan 9, 2025
98fb2fb
Revert "fix template"
SpriCoder Jan 9, 2025
8d093d4
Revert "add IIoTDBMemoryBlock"
SpriCoder Jan 9, 2025
4974193
Revert "init first version of memory manager and memory block"
SpriCoder Jan 9, 2025
3784035
rollback 2
SpriCoder Jan 9, 2025
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
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
import org.apache.iotdb.db.queryengine.metric.QueryRelatedResourceMetricSet;
import org.apache.iotdb.db.queryengine.metric.QueryResourceMetricSet;
import org.apache.iotdb.db.queryengine.metric.SeriesScanCostMetricSet;
import org.apache.iotdb.db.service.metrics.memory.ThresholdMemoryMetrics;
import org.apache.iotdb.db.service.metrics.memory.GlobalMemoryMetrics;
import org.apache.iotdb.db.storageengine.load.metrics.ActiveLoadingFilesNumberMetricsSet;
import org.apache.iotdb.db.storageengine.load.metrics.ActiveLoadingFilesSizeMetricsSet;
import org.apache.iotdb.db.storageengine.load.metrics.LoadTsFileCostMetricsSet;
Expand Down Expand Up @@ -105,7 +105,7 @@ public static void bind() {
metricService.addMetricSet(ActiveLoadingFilesSizeMetricsSet.getInstance());

// bind memory related metrics
metricService.addMetricSet(ThresholdMemoryMetrics.getInstance());
metricService.addMetricSet(GlobalMemoryMetrics.getInstance());
}

private static void initSystemMetrics(MetricService metricService) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

package org.apache.iotdb.db.service.metrics.memory;

import org.apache.iotdb.commons.service.metric.enums.Metric;
import org.apache.iotdb.commons.service.metric.enums.Tag;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.metrics.AbstractMetricService;
import org.apache.iotdb.metrics.metricsets.IMetricSet;
import org.apache.iotdb.metrics.utils.MetricLevel;
import org.apache.iotdb.metrics.utils.MetricType;

public class ConsensusMemoryMetrics implements IMetricSet {
private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
private static final String CONSENSUS = "Consensus";

@Override
public void bindTo(AbstractMetricService metricService) {
metricService
.getOrCreateGauge(
Metric.MEMORY_THRESHOLD_SIZE.toString(),
MetricLevel.NORMAL,
Tag.NAME.toString(),
CONSENSUS,
Tag.TYPE.toString(),
GlobalMemoryMetrics.ON_HEAP,
Tag.LEVEL.toString(),
GlobalMemoryMetrics.LEVELS[1])
.set(config.getAllocateMemoryForConsensus());
}

@Override
public void unbindFrom(AbstractMetricService metricService) {
metricService.remove(
MetricType.GAUGE,
Metric.MEMORY_THRESHOLD_SIZE.toString(),
Tag.NAME.toString(),
CONSENSUS,
Tag.TYPE.toString(),
GlobalMemoryMetrics.ON_HEAP,
Tag.LEVEL.toString(),
GlobalMemoryMetrics.LEVELS[1]);
}

public static ConsensusMemoryMetrics getInstance() {
return ConsensusMemoryMetricsHolder.INSTANCE;
}

private static class ConsensusMemoryMetricsHolder {

private static final ConsensusMemoryMetrics INSTANCE = new ConsensusMemoryMetrics();

private ConsensusMemoryMetricsHolder() {}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

package org.apache.iotdb.db.service.metrics.memory;

import org.apache.iotdb.commons.service.metric.enums.Metric;
import org.apache.iotdb.commons.service.metric.enums.Tag;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.storageengine.rescon.memory.SystemInfo;
import org.apache.iotdb.metrics.AbstractMetricService;
import org.apache.iotdb.metrics.metricsets.IMetricSet;
import org.apache.iotdb.metrics.utils.MetricLevel;
import org.apache.iotdb.metrics.utils.MetricType;

import java.util.Arrays;
import java.util.Collections;

public class GlobalMemoryMetrics implements IMetricSet {
private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
private static final SystemInfo systemInfo = SystemInfo.getInstance();

private static final String TOTAL = "Total";
public static final String ON_HEAP = "OnHeap";
public static final String OFF_HEAP = "OffHeap";
public static final String[] LEVELS = {"0", "1", "2", "3", "4"};

private static final String DIRECT_BUFFER = "DirectBuffer";

@Override
public void bindTo(AbstractMetricService metricService) {
metricService
.getOrCreateGauge(
Metric.MEMORY_THRESHOLD_SIZE.toString(),
MetricLevel.NORMAL,
Tag.NAME.toString(),
TOTAL,
Tag.TYPE.toString(),
ON_HEAP,
Tag.LEVEL.toString(),
LEVELS[0])
.set(Runtime.getRuntime().maxMemory());
metricService
.getOrCreateGauge(
Metric.MEMORY_THRESHOLD_SIZE.toString(),
MetricLevel.NORMAL,
Tag.NAME.toString(),
TOTAL,
Tag.TYPE.toString(),
OFF_HEAP,
Tag.LEVEL.toString(),
LEVELS[0])
.set(config.getMaxOffHeapMemoryBytes());
StorageEngineMemoryMetrics.getInstance().bindTo(metricService);
QueryEngineMemoryMetrics.getInstance().bindTo(metricService);
SchemaEngineMemoryMetrics.getInstance().bindTo(metricService);
ConsensusMemoryMetrics.getInstance().bindTo(metricService);
StreamEngineMemoryMetrics.getInstance().bindTo(metricService);
metricService
.getOrCreateGauge(
Metric.MEMORY_THRESHOLD_SIZE.toString(),
MetricLevel.NORMAL,
Tag.NAME.toString(),
DIRECT_BUFFER,
Tag.TYPE.toString(),
OFF_HEAP,
Tag.LEVEL.toString(),
LEVELS[1])
.set(systemInfo.getTotalDirectBufferMemorySizeLimit());
}

@Override
public void unbindFrom(AbstractMetricService metricService) {
Arrays.asList(ON_HEAP, OFF_HEAP)
.forEach(
type -> {
metricService.remove(
MetricType.GAUGE,
Metric.MEMORY_THRESHOLD_SIZE.toString(),
Tag.NAME.toString(),
TOTAL,
Tag.TYPE.toString(),
type,
Tag.LEVEL.toString(),
LEVELS[0]);
});
StorageEngineMemoryMetrics.getInstance().unbindFrom(metricService);
QueryEngineMemoryMetrics.getInstance().unbindFrom(metricService);
SchemaEngineMemoryMetrics.getInstance().unbindFrom(metricService);
ConsensusMemoryMetrics.getInstance().unbindFrom(metricService);
StreamEngineMemoryMetrics.getInstance().unbindFrom(metricService);
Collections.singletonList(DIRECT_BUFFER)
.forEach(
name ->
metricService.remove(
MetricType.GAUGE,
Metric.MEMORY_THRESHOLD_SIZE.toString(),
Tag.NAME.toString(),
name,
Tag.TYPE.toString(),
OFF_HEAP,
Tag.LEVEL.toString(),
LEVELS[1]));
}

public static GlobalMemoryMetrics getInstance() {
return GlobalMemoryMetricsHolder.INSTANCE;
}

private static class GlobalMemoryMetricsHolder {

private static final GlobalMemoryMetrics INSTANCE = new GlobalMemoryMetrics();

private GlobalMemoryMetricsHolder() {}
}
}
Loading
Loading