This is an automated email from the ASF dual-hosted git repository. liurui pushed a commit to branch monitor in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 5bc8ba2a95634ede3e882bca7d4f5bed66360b34 Author: liuruiyiyang <[email protected]> AuthorDate: Thu Nov 21 19:00:12 2019 +0800 fix(StatMonitor): remove initial value --- .../apache/iotdb/db/monitor/MonitorConstants.java | 33 +--------------------- .../org/apache/iotdb/db/monitor/StatMonitor.java | 20 ++----------- .../iotdb/db/monitor/collector/FileSize.java | 5 ++-- 3 files changed, 5 insertions(+), 53 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/monitor/MonitorConstants.java b/server/src/main/java/org/apache/iotdb/db/monitor/MonitorConstants.java index ab1cb5f..1fbe595 100644 --- a/server/src/main/java/org/apache/iotdb/db/monitor/MonitorConstants.java +++ b/server/src/main/java/org/apache/iotdb/db/monitor/MonitorConstants.java @@ -20,8 +20,6 @@ package org.apache.iotdb.db.monitor; import java.io.File; -import java.util.HashMap; -import java.util.concurrent.atomic.AtomicLong; import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBConstant; import org.apache.iotdb.db.conf.IoTDBDescriptor; @@ -30,7 +28,7 @@ public class MonitorConstants { private static IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig(); public static final String DATA_TYPE_INT64 = "INT64"; - public static final String MONITOR_STORAGE_GROUP = "root.monitor"; + public static final String MONITOR_STORAGE_GROUP = "root.MONITOR"; /** * statistic for file size statistic module @@ -50,35 +48,6 @@ public class MonitorConstants { public static final String REQUEST_METRIC_PREFIX = MONITOR_STORAGE_GROUP + IoTDBConstant.PATH_SEPARATOR + "request"; - /** - * function for initializing stats values. - * - * @param constantsType produce initialization values for Statistics Params - * @return HashMap contains all the Statistics Params - */ - static HashMap<String, Object> initValues(String constantsType) { - HashMap<String, Object> hashMap = new HashMap<>(); - switch (constantsType) { - case MonitorConstants.STORAGE_ENGINE_METRIC_PREFIX: - for (StorageEngineMetrics metrics : StorageEngineMetrics.values()) { - hashMap.put(metrics.name(), new AtomicLong(0)); - } - break; - case MonitorConstants.FILE_SIZE_METRIC_PREFIX: - for (FileSizeMetrics kinds : FileSizeMetrics.values()) { - hashMap.put(kinds.name(), new AtomicLong(0)); - } - break; - case MonitorConstants.REQUEST_METRIC_PREFIX: - for (TSServiceImplMetrics kinds : TSServiceImplMetrics.values()) { - hashMap.put(kinds.name(), new AtomicLong(0)); - } - break; - default: - } - return hashMap; - } - public enum StorageEngineMetrics { OK_POINTS, FAIL_POINTS } diff --git a/server/src/main/java/org/apache/iotdb/db/monitor/StatMonitor.java b/server/src/main/java/org/apache/iotdb/db/monitor/StatMonitor.java index c1a6993..ae2aff1 100644 --- a/server/src/main/java/org/apache/iotdb/db/monitor/StatMonitor.java +++ b/server/src/main/java/org/apache/iotdb/db/monitor/StatMonitor.java @@ -151,7 +151,7 @@ public class StatMonitor implements IService { } public void recovery() { - // // restore the FildeNode Manager TOTAL_POINTS statistics info + // currently we do not persist monitor metrics data } private void activate() { @@ -282,23 +282,7 @@ public class StatMonitor implements IService { long currentTimeMillis = System.currentTimeMillis(); HashMap<String, TSRecord> tsRecordHashMap = new HashMap<>(); for (Map.Entry<String, IStatistic> entry : statisticMap.entrySet()) { - if (entry.getValue() == null) { - switch (entry.getKey()) { - case MonitorConstants.STORAGE_ENGINE_METRIC_PREFIX: - tsRecordHashMap.put(entry.getKey(), - convertToTSRecord( - MonitorConstants.initValues(MonitorConstants.STORAGE_ENGINE_METRIC_PREFIX), - entry.getKey(), currentTimeMillis)); - break; - case MonitorConstants.FILE_SIZE_METRIC_PREFIX: - tsRecordHashMap.put(entry.getKey(), - convertToTSRecord( - MonitorConstants.initValues(MonitorConstants.FILE_SIZE_METRIC_PREFIX), - entry.getKey(), currentTimeMillis)); - break; - default: - } - } else { + if (entry.getValue() != null) { tsRecordHashMap.putAll(entry.getValue().getAllStatisticsValue()); } } diff --git a/server/src/main/java/org/apache/iotdb/db/monitor/collector/FileSize.java b/server/src/main/java/org/apache/iotdb/db/monitor/collector/FileSize.java index e57de4a..9cccd27 100644 --- a/server/src/main/java/org/apache/iotdb/db/monitor/collector/FileSize.java +++ b/server/src/main/java/org/apache/iotdb/db/monitor/collector/FileSize.java @@ -80,7 +80,7 @@ public class FileSize implements IStatistic { storageEngine.addTimeSeries(path, TSDataType.valueOf(MonitorConstants.DATA_TYPE_INT64), TSEncoding.valueOf("RLE"), CompressionType.valueOf(TSFileDescriptor.getInstance().getConfig().getCompressor()), Collections.emptyMap()); - } catch (StorageEngineException e) { + } catch (StorageEngineException e) { logger.error("Register File Size Stats into storageEngine Failed.", e); } } @@ -98,13 +98,12 @@ public class FileSize implements IStatistic { } private static class FileSizeHolder { - private static final FileSize INSTANCE = new FileSize(); } private FileSize() { - storageEngine = StorageEngine.getInstance(); if (config.isEnableStatMonitor()) { + storageEngine = StorageEngine.getInstance(); StatMonitor statMonitor = StatMonitor.getInstance(); registerStatMetadata(); statMonitor.registerStatistics(MonitorConstants.FILE_SIZE_METRIC_PREFIX, this);
