This is an automated email from the ASF dual-hosted git repository.
chaow pushed a commit to branch feature/metric2021
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/feature/metric2021 by this
push:
new 2efa8f8 fix jmx register twice
2efa8f8 is described below
commit 2efa8f835e4dabd1b3b1fe3d3706240653e0287a
Author: chaow <[email protected]>
AuthorDate: Thu Feb 25 17:55:06 2021 +0800
fix jmx register twice
---
.../org/apache/iotdb/metrics/MetricService.java | 2 +-
.../micrometer/MicrometerMetricManager.java | 2 +-
.../micrometer/MicrometerMetricReporter.java | 4 +-
.../micrometer/MicrometerMetricManagerTest.java | 37 ++++++++++++++++++
.../src/test/resources/logback.xml | 45 ++++++++++++++++++++++
.../java/org/apache/iotdb/db/service/IoTDB.java | 5 ++-
.../apache/iotdb/db/utils/FilePathUtilsTest.java | 3 +-
7 files changed, 90 insertions(+), 8 deletions(-)
diff --git
a/metrics/interface/src/main/java/org/apache/iotdb/metrics/MetricService.java
b/metrics/interface/src/main/java/org/apache/iotdb/metrics/MetricService.java
index 8e1af33..c7a03fb 100644
---
a/metrics/interface/src/main/java/org/apache/iotdb/metrics/MetricService.java
+++
b/metrics/interface/src/main/java/org/apache/iotdb/metrics/MetricService.java
@@ -49,7 +49,7 @@ public class MetricService {
private MetricService() {}
private static void init() {
- logger.debug("init metric service");
+ logger.info("init metric service");
ServiceLoader<MetricManager> metricManagers =
ServiceLoader.load(MetricManager.class);
int size = 0;
MetricManager nothingManager = new DoNothingMetricManager();
diff --git
a/metrics/micrometer-metrics/src/main/java/org/apache/iotdb/metrics/micrometer/MicrometerMetricManager.java
b/metrics/micrometer-metrics/src/main/java/org/apache/iotdb/metrics/micrometer/MicrometerMetricManager.java
index 249902c..5888cac 100644
---
a/metrics/micrometer-metrics/src/main/java/org/apache/iotdb/metrics/micrometer/MicrometerMetricManager.java
+++
b/metrics/micrometer-metrics/src/main/java/org/apache/iotdb/metrics/micrometer/MicrometerMetricManager.java
@@ -82,7 +82,7 @@ public class MicrometerMetricManager implements MetricManager
{
@Override
public boolean init() {
- logger.debug("micrometer init registry");
+ logger.info("micrometer init registry");
List<String> reporters = metricConfig.getReporterList();
for (String reporter : reporters) {
switch (ReporterType.get(reporter)) {
diff --git
a/metrics/micrometer-metrics/src/main/java/org/apache/iotdb/metrics/micrometer/MicrometerMetricReporter.java
b/metrics/micrometer-metrics/src/main/java/org/apache/iotdb/metrics/micrometer/MicrometerMetricReporter.java
index 3639dbe..5585218 100644
---
a/metrics/micrometer-metrics/src/main/java/org/apache/iotdb/metrics/micrometer/MicrometerMetricReporter.java
+++
b/metrics/micrometer-metrics/src/main/java/org/apache/iotdb/metrics/micrometer/MicrometerMetricReporter.java
@@ -90,8 +90,8 @@ public class MicrometerMetricReporter implements
MetricReporter {
}
private void startJmxReporter(JmxMeterRegistry jmxMeterRegistry) {
- logger.debug("start jmx reporter from micrometer");
- jmxMeterRegistry.start();
+ logger.info("start jmx reporter from micrometer");
+ //jmxMeterRegistry.start();
}
@Override
diff --git
a/metrics/micrometer-metrics/src/test/java/org/apache/iotdb/metric/micrometer/MicrometerMetricManagerTest.java
b/metrics/micrometer-metrics/src/test/java/org/apache/iotdb/metric/micrometer/MicrometerMetricManagerTest.java
new file mode 100644
index 0000000..8dd8cd1
--- /dev/null
+++
b/metrics/micrometer-metrics/src/test/java/org/apache/iotdb/metric/micrometer/MicrometerMetricManagerTest.java
@@ -0,0 +1,37 @@
+/*
+ * 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.metric.micrometer;
+
+import org.apache.iotdb.metrics.MetricManager;
+import org.apache.iotdb.metrics.MetricService;
+import org.junit.Test;
+
+import java.util.concurrent.TimeUnit;
+
+public class MicrometerMetricManagerTest {
+
+ MetricManager metricManager = MetricService.getMetricManager();
+
+ @Test
+ public void testRegister() {
+ metricManager.timer("timer1", "sg", "root").update(12,
TimeUnit.MILLISECONDS);;
+ }
+
+}
diff --git a/metrics/micrometer-metrics/src/test/resources/logback.xml
b/metrics/micrometer-metrics/src/test/resources/logback.xml
new file mode 100644
index 0000000..48cefa9
--- /dev/null
+++ b/metrics/micrometer-metrics/src/test/resources/logback.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<configuration debug="false">
+ <property name="LOG_PATH" value="target/logs"/>
+ <!-- prevent logback from outputting its own status at the start of every
log -->
+ <statusListener class="ch.qos.logback.core.status.NopStatusListener"/>
+ <appender class="ch.qos.logback.core.ConsoleAppender" name="stdout">
+ <Target>System.out</Target>
+ <encoder>
+ <pattern>%-5p [%d] [%thread] %C:%L - %m %n</pattern>
+ <charset>utf-8</charset>
+ </encoder>
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <level>INFO</level>
+ </filter>
+ </appender>
+ <!--<logger name="org.apache.iotdb.db.utils.OpenFileNumUtil" level="debug"
/>-->
+ <!--<logger name="org.apache.iotdb.db.utils.OpenFileNumUtilTest"
level="debug" />-->
+ <!-- do not print "Can't get the cpu ratio,because this OS:mac os x is not
support in test"-->
+ <!-- enable me if you want to monitor when files are opened and closed.
+ <logger name="FileMonitor" level="info"/>
+ -->
+ <root level="warn">
+ <appender-ref ref="stdout"/>
+ </root>
+</configuration>
diff --git a/server/src/main/java/org/apache/iotdb/db/service/IoTDB.java
b/server/src/main/java/org/apache/iotdb/db/service/IoTDB.java
index 7ad371a..2028571 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/IoTDB.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/IoTDB.java
@@ -47,6 +47,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.util.concurrent.TimeUnit;
public class IoTDB implements IoTDBMBean {
@@ -60,7 +61,7 @@ public class IoTDB implements IoTDBMBean {
return IoTDBHolder.INSTANCE;
}
- public static final MetricManager serverMetricManager =
MetricService.getMetricManager();
+ public static final MetricManager serverMetricManager =
MetricService.getMetricManager();;
public static void main(String[] args) {
if (args.length > 0) {
@@ -135,7 +136,7 @@ public class IoTDB implements IoTDBMBean {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
- logger.warn("IoTDB failed to set up for:" + e.getMessage());
+ logger.warn("IoTDB failed to set up.", e);
Thread.currentThread().interrupt();
return;
}
diff --git
a/server/src/test/java/org/apache/iotdb/db/utils/FilePathUtilsTest.java
b/server/src/test/java/org/apache/iotdb/db/utils/FilePathUtilsTest.java
index 65c0a46..46e52e9 100644
--- a/server/src/test/java/org/apache/iotdb/db/utils/FilePathUtilsTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/utils/FilePathUtilsTest.java
@@ -18,10 +18,9 @@
*/
package org.apache.iotdb.db.utils;
+import org.apache.commons.io.FileUtils;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.tsfile.utils.Pair;
-
-import org.apache.commons.io.FileUtils;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
