[iotdb] branch rel/0.13 updated: [To rel/0.13][IOTDB-4776] modify default metric storagegroup to `root.__system` (#7812)

[qiaojialin]

This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch rel/0.13
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/rel/0.13 by this push:
     new 8e120e79b0 [To rel/0.13][IOTDB-4776] modify default metric 
storagegroup to `root.__system` (#7812)
8e120e79b0 is described below

commit 8e120e79b09c4531099c232a84fa07e3975feca1
Author: ZhangHongYin <46039728+sprico...@users.noreply.github.com>
AuthorDate: Mon Oct 31 18:21:16 2022 +0800

    [To rel/0.13][IOTDB-4776] modify default metric storagegroup to 
`root.__system` (#7812)
---
 .../metrics/dropwizard/reporter/IoTDBReporter.java |  1 -
 .../iotdb/metrics/utils/IoTDBMetricsUtils.java     | 26 +++-------------------
 .../micrometer/reporter/IoTDBMeterRegistry.java    |  1 -
 3 files changed, 3 insertions(+), 25 deletions(-)

diff --git 
a/metrics/dropwizard-metrics/src/main/java/org/apache/iotdb/metrics/dropwizard/reporter/IoTDBReporter.java
 
b/metrics/dropwizard-metrics/src/main/java/org/apache/iotdb/metrics/dropwizard/reporter/IoTDBReporter.java
index c93a78c631..049f495037 100644
--- 
a/metrics/dropwizard-metrics/src/main/java/org/apache/iotdb/metrics/dropwizard/reporter/IoTDBReporter.java
+++ 
b/metrics/dropwizard-metrics/src/main/java/org/apache/iotdb/metrics/dropwizard/reporter/IoTDBReporter.java
@@ -82,7 +82,6 @@ public class IoTDBReporter extends ScheduledReporter {
             ioTDBReporterConfig.getUsername(),
             ioTDBReporterConfig.getPassword(),
             ioTDBReporterConfig.getMaxConnectionNumber());
-    IoTDBMetricsUtils.checkOrCreateStorageGroup(sessionPool);
   }
 
   @Override
diff --git 
a/metrics/interface/src/main/java/org/apache/iotdb/metrics/utils/IoTDBMetricsUtils.java
 
b/metrics/interface/src/main/java/org/apache/iotdb/metrics/utils/IoTDBMetricsUtils.java
index 5842d7918f..553b39c52c 100644
--- 
a/metrics/interface/src/main/java/org/apache/iotdb/metrics/utils/IoTDBMetricsUtils.java
+++ 
b/metrics/interface/src/main/java/org/apache/iotdb/metrics/utils/IoTDBMetricsUtils.java
@@ -21,27 +21,20 @@ package org.apache.iotdb.metrics.utils;
 
 import org.apache.iotdb.metrics.config.MetricConfig;
 import org.apache.iotdb.metrics.config.MetricConfigDescriptor;
-import org.apache.iotdb.rpc.IoTDBConnectionException;
-import org.apache.iotdb.rpc.StatementExecutionException;
-import org.apache.iotdb.session.pool.SessionDataSetWrapper;
-import org.apache.iotdb.session.pool.SessionPool;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.Map;
 
 public class IoTDBMetricsUtils {
-  private static final Logger logger = 
LoggerFactory.getLogger(IoTDBMetricsUtils.class);
   private static final MetricConfig metricConfig =
       MetricConfigDescriptor.getInstance().getMetricConfig();
-  private static final String STORAGE_GROUP =
-      "root.system." + metricConfig.getIoTDBReporterConfig().getDatabase();
+  private static final String STORAGE_GROUP = "root.__system";
 
   public static String generatePath(String name, Map<String, String> labels) {
     StringBuilder stringBuilder = new StringBuilder();
     stringBuilder
         .append(STORAGE_GROUP)
+        .append(".")
+        .append(metricConfig.getIoTDBReporterConfig().getDatabase())
         .append(".\"")
         .append(metricConfig.getRpcAddress())
         .append(":")
@@ -62,17 +55,4 @@ public class IoTDBMetricsUtils {
     }
     return stringBuilder.toString();
   }
-
-  public static void checkOrCreateStorageGroup(SessionPool session) {
-    try (SessionDataSetWrapper result =
-        session.executeQueryStatement("show storage group " + STORAGE_GROUP)) {
-      if (!result.hasNext()) {
-        session.setStorageGroup(STORAGE_GROUP);
-      }
-    } catch (IoTDBConnectionException e) {
-      logger.error("CheckOrCreateStorageGroup failed because ", e);
-    } catch (StatementExecutionException e) {
-      // do nothing
-    }
-  }
 }
diff --git 
a/metrics/micrometer-metrics/src/main/java/org/apache/iotdb/metrics/micrometer/reporter/IoTDBMeterRegistry.java
 
b/metrics/micrometer-metrics/src/main/java/org/apache/iotdb/metrics/micrometer/reporter/IoTDBMeterRegistry.java
index 46557b3fbf..217556716d 100644
--- 
a/metrics/micrometer-metrics/src/main/java/org/apache/iotdb/metrics/micrometer/reporter/IoTDBMeterRegistry.java
+++ 
b/metrics/micrometer-metrics/src/main/java/org/apache/iotdb/metrics/micrometer/reporter/IoTDBMeterRegistry.java
@@ -57,7 +57,6 @@ public class IoTDBMeterRegistry extends StepMeterRegistry {
             ioTDBReporterConfig.getUsername(),
             ioTDBReporterConfig.getPassword(),
             ioTDBReporterConfig.getMaxConnectionNumber());
-    IoTDBMetricsUtils.checkOrCreateStorageGroup(sessionPool);
   }
 
   @Override