You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by sp...@apache.org on 2023/03/19 15:21:10 UTC
[iotdb] branch rel/1.1 updated: Revert "[IOTDB-5681] Fix the creation of system database used by IoTDB Internal Reporter (#9339)"
This is an automated email from the ASF dual-hosted git repository.
spricoder pushed a commit to branch rel/1.1
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/1.1 by this push:
new 531b80285e Revert "[IOTDB-5681] Fix the creation of system database used by IoTDB Internal Reporter (#9339)"
531b80285e is described below
commit 531b80285e632608c79caddbaf0512d98f6ebaa5
Author: spricoder <sp...@qq.com>
AuthorDate: Sun Mar 19 23:20:54 2023 +0800
Revert "[IOTDB-5681] Fix the creation of system database used by IoTDB Internal Reporter (#9339)"
This reverts commit 4fd07ce21df4bd2fbcb399c4b1540803005d210c.
---
.../metrics/IoTDBInternalLocalReporter.java | 37 ----------------------
1 file changed, 37 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/service/metrics/IoTDBInternalLocalReporter.java b/server/src/main/java/org/apache/iotdb/db/service/metrics/IoTDBInternalLocalReporter.java
index a275bbad6a..2714387735 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/metrics/IoTDBInternalLocalReporter.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/metrics/IoTDBInternalLocalReporter.java
@@ -19,17 +19,8 @@
package org.apache.iotdb.db.service.metrics;
-import org.apache.iotdb.common.rpc.thrift.TSStatus;
-import org.apache.iotdb.commons.client.IClientManager;
-import org.apache.iotdb.commons.client.exception.ClientManagerException;
import org.apache.iotdb.commons.concurrent.threadpool.ScheduledExecutorUtil;
-import org.apache.iotdb.commons.consensus.ConfigRegionId;
import org.apache.iotdb.commons.exception.IllegalPathException;
-import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
-import org.apache.iotdb.confignode.rpc.thrift.TShowDatabaseResp;
-import org.apache.iotdb.db.client.ConfigNodeClient;
-import org.apache.iotdb.db.client.ConfigNodeClientManager;
-import org.apache.iotdb.db.client.ConfigNodeInfo;
import org.apache.iotdb.db.exception.query.QueryProcessException;
import org.apache.iotdb.db.mpp.common.SessionInfo;
import org.apache.iotdb.db.mpp.plan.Coordinator;
@@ -44,7 +35,6 @@ import org.apache.iotdb.db.query.control.SessionManager;
import org.apache.iotdb.metrics.config.MetricConfigDescriptor;
import org.apache.iotdb.metrics.reporter.iotdb.IoTDBInternalReporter;
import org.apache.iotdb.metrics.utils.InternalReporterType;
-import org.apache.iotdb.metrics.utils.IoTDBMetricsUtils;
import org.apache.iotdb.metrics.utils.ReporterType;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.TSStatusCode;
@@ -52,14 +42,12 @@ import org.apache.iotdb.service.rpc.thrift.TSInsertRecordReq;
import org.apache.iotdb.session.util.SessionUtils;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
-import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.nio.ByteBuffer;
import java.time.ZoneId;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executors;
@@ -81,31 +69,6 @@ public class IoTDBInternalLocalReporter extends IoTDBInternalReporter {
partitionFetcher = ClusterPartitionFetcher.getInstance();
schemaFetcher = ClusterSchemaFetcher.getInstance();
sessionInfo = new SessionInfo(0, "root", ZoneId.systemDefault().getId());
-
- IClientManager<ConfigRegionId, ConfigNodeClient> configNodeClientManager =
- ConfigNodeClientManager.getInstance();
- try (ConfigNodeClient client =
- configNodeClientManager.borrowClient(ConfigNodeInfo.CONFIG_REGION_ID)) {
- TShowDatabaseResp showDatabaseResp =
- client.showDatabase(Arrays.asList(IoTDBMetricsUtils.DATABASE.split("\\.")));
- if (TSStatusCode.SUCCESS_STATUS.getStatusCode() == showDatabaseResp.getStatus().getCode()
- && showDatabaseResp.getDatabaseInfoMapSize() == 0) {
- TDatabaseSchema databaseSchema = new TDatabaseSchema();
- databaseSchema.setName(IoTDBMetricsUtils.DATABASE);
- databaseSchema.setSchemaReplicationFactor(1);
- databaseSchema.setDataReplicationFactor(1);
- databaseSchema.setMaxSchemaRegionGroupNum(1);
- databaseSchema.setMinSchemaRegionGroupNum(1);
- databaseSchema.setMaxDataRegionGroupNum(1);
- TSStatus tsStatus = client.setDatabase(databaseSchema);
- if (TSStatusCode.SUCCESS_STATUS.getStatusCode() != tsStatus.getCode()) {
- LOGGER.error("IoTDBSessionReporter checkOrCreateDatabase failed.");
- }
- }
- } catch (ClientManagerException | TException e) {
- // do nothing
- LOGGER.warn("IoTDBSessionReporter checkOrCreateDatabase failed because ", e);
- }
}
@Override