You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ta...@apache.org on 2023/07/10 15:42:08 UTC
[iotdb] branch rel/1.1 updated: [IOTDB-6000] Control the RegionGroup number of system Database (#10213) (#10498)
This is an automated email from the ASF dual-hosted git repository.
tanxinyu 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 aa8f9aab08f [IOTDB-6000] Control the RegionGroup number of system Database (#10213) (#10498)
aa8f9aab08f is described below
commit aa8f9aab08f2749d386492e235f870bd3d54c6df
Author: Potato <ta...@apache.org>
AuthorDate: Mon Jul 10 23:42:01 2023 +0800
[IOTDB-6000] Control the RegionGroup number of system Database (#10213) (#10498)
Co-authored-by: YongzaoDan <33...@users.noreply.github.com>
---
.../manager/schema/ClusterSchemaManager.java | 11 +++++++++--
.../service/thrift/ConfigNodeRPCServiceProcessor.java | 18 ++++++++++++++----
2 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/schema/ClusterSchemaManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/schema/ClusterSchemaManager.java
index 109e9833620..45efa8128af 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/schema/ClusterSchemaManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/schema/ClusterSchemaManager.java
@@ -78,6 +78,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowDatabaseResp;
import org.apache.iotdb.db.metadata.template.Template;
import org.apache.iotdb.db.metadata.template.TemplateInternalRPCUpdateType;
import org.apache.iotdb.db.metadata.template.TemplateInternalRPCUtil;
+import org.apache.iotdb.metrics.utils.IoTDBMetricsUtils;
import org.apache.iotdb.mpp.rpc.thrift.TUpdateTemplateReq;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.TSStatusCode;
@@ -405,14 +406,20 @@ public class ClusterSchemaManager {
int databaseNum = databaseSchemaMap.size();
for (TDatabaseSchema databaseSchema : databaseSchemaMap.values()) {
- if (!isDatabaseExist(databaseSchema.getName())) {
- // filter the pre deleted database
+ if (!isDatabaseExist(databaseSchema.getName())
+ || databaseSchema.getName().equals(IoTDBMetricsUtils.DATABASE)) {
+ // filter the pre deleted database and the system database
databaseNum--;
}
}
AdjustMaxRegionGroupNumPlan adjustMaxRegionGroupNumPlan = new AdjustMaxRegionGroupNumPlan();
for (TDatabaseSchema databaseSchema : databaseSchemaMap.values()) {
+ if (databaseSchema.getName().equals(IoTDBMetricsUtils.DATABASE)) {
+ // filter the system database
+ continue;
+ }
+
try {
// Adjust maxSchemaRegionGroupNum for each Database.
// All Databases share the DataNodes equally.
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java b/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
index e601f1b0efa..f0dfa97911d 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
@@ -156,6 +156,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TUpdateModelStateReq;
import org.apache.iotdb.confignode.service.ConfigNode;
import org.apache.iotdb.consensus.common.response.ConsensusGenericResponse;
import org.apache.iotdb.db.mpp.plan.statement.AuthorType;
+import org.apache.iotdb.metrics.utils.IoTDBMetricsUtils;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.TSStatusCode;
@@ -272,6 +273,7 @@ public class ConfigNodeRPCServiceProcessor implements IConfigNodeRPCService.Ifac
@Override
public TSStatus setDatabase(TDatabaseSchema databaseSchema) {
TSStatus errorResp = null;
+ boolean isSystemDatabase = databaseSchema.getName().equals(IoTDBMetricsUtils.DATABASE);
// Set default configurations if necessary
if (!databaseSchema.isSetTTL()) {
@@ -282,7 +284,9 @@ public class ConfigNodeRPCServiceProcessor implements IConfigNodeRPCService.Ifac
.setMessage("Failed to create database. The TTL should be positive.");
}
- if (!databaseSchema.isSetSchemaReplicationFactor()) {
+ if (isSystemDatabase) {
+ databaseSchema.setSchemaReplicationFactor(1);
+ } else if (!databaseSchema.isSetSchemaReplicationFactor()) {
databaseSchema.setSchemaReplicationFactor(CONFIG_NODE_CONFIG.getSchemaReplicationFactor());
} else if (databaseSchema.getSchemaReplicationFactor() <= 0) {
errorResp =
@@ -291,7 +295,9 @@ public class ConfigNodeRPCServiceProcessor implements IConfigNodeRPCService.Ifac
"Failed to create database. The schemaReplicationFactor should be positive.");
}
- if (!databaseSchema.isSetDataReplicationFactor()) {
+ if (isSystemDatabase) {
+ databaseSchema.setDataReplicationFactor(1);
+ } else if (!databaseSchema.isSetDataReplicationFactor()) {
databaseSchema.setDataReplicationFactor(CONFIG_NODE_CONFIG.getDataReplicationFactor());
} else if (databaseSchema.getDataReplicationFactor() <= 0) {
errorResp =
@@ -309,7 +315,9 @@ public class ConfigNodeRPCServiceProcessor implements IConfigNodeRPCService.Ifac
"Failed to create database. The timePartitionInterval should be positive.");
}
- if (!databaseSchema.isSetMinSchemaRegionGroupNum()) {
+ if (isSystemDatabase) {
+ databaseSchema.setMinSchemaRegionGroupNum(1);
+ } else if (!databaseSchema.isSetMinSchemaRegionGroupNum()) {
databaseSchema.setMinSchemaRegionGroupNum(
CONFIG_NODE_CONFIG.getDefaultSchemaRegionGroupNumPerDatabase());
} else if (databaseSchema.getMinSchemaRegionGroupNum() <= 0) {
@@ -319,7 +327,9 @@ public class ConfigNodeRPCServiceProcessor implements IConfigNodeRPCService.Ifac
"Failed to create database. The schemaRegionGroupNum should be positive.");
}
- if (!databaseSchema.isSetMinDataRegionGroupNum()) {
+ if (isSystemDatabase) {
+ databaseSchema.setMinDataRegionGroupNum(1);
+ } else if (!databaseSchema.isSetMinDataRegionGroupNum()) {
databaseSchema.setMinDataRegionGroupNum(
CONFIG_NODE_CONFIG.getDefaultDataRegionGroupNumPerDatabase());
} else if (databaseSchema.getMinDataRegionGroupNum() <= 0) {