You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2022/09/20 02:21:41 UTC

[iotdb] branch master updated: fix default config. (#7347)

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

xingtanzjr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new b572da8dd6 fix default config. (#7347)
b572da8dd6 is described below

commit b572da8dd6df56dd442815801ad935786b1f2250
Author: ZhangHongYin <46...@users.noreply.github.com>
AuthorDate: Tue Sep 20 10:21:36 2022 +0800

    fix default config. (#7347)
---
 .../confignode1conf/iotdb-confignode.properties    | 18 ++-----
 .../confignode2conf/iotdb-confignode.properties    | 10 ++--
 .../confignode3conf/iotdb-confignode.properties    | 10 ++--
 .../resources/datanode1conf/iotdb-rest.properties  | 61 ++++++++++++++++++++++
 .../resources/datanode2conf/iotdb-rest.properties  | 61 ++++++++++++++++++++++
 .../resources/datanode3conf/iotdb-rest.properties  | 61 ++++++++++++++++++++++
 6 files changed, 198 insertions(+), 23 deletions(-)

diff --git a/confignode/src/test/resources/confignode1conf/iotdb-confignode.properties b/confignode/src/test/resources/confignode1conf/iotdb-confignode.properties
index 17f3017d90..888d0a6ec1 100644
--- a/confignode/src/test/resources/confignode1conf/iotdb-confignode.properties
+++ b/confignode/src/test/resources/confignode1conf/iotdb-confignode.properties
@@ -18,22 +18,14 @@
 # under the License.
 #
 
-internal_address=0.0.0.0
+internal_address=127.0.0.1
 internal_port=22277
 consensus_port=22278
-target_config_nodes=0.0.0.0:22277
-config_node_consensus_protocol_class=org.apache.iotdb.consensus.ratis.RatisConsensus
-data_region_consensus_protocol_class=org.apache.iotdb.consensus.ratis.RatisConsensus
+target_config_nodes=127.0.0.1:22277
+data_region_consensus_protocol_class=org.apache.iotdb.consensus.multileader.MultiLeaderConsensus
 schema_region_consensus_protocol_class=org.apache.iotdb.consensus.ratis.RatisConsensus
-
-# Default number of SchemaRegion replicas
-# Datatype: int
-#schema_replication_factor=1
-
-
-# Default number of DataRegion replicas
-# Datatype: int
-#data_replication_factor=1
+schema_replication_factor=3
+data_replication_factor=3
 system_dir=target/confignode1/system
 data_dirs=target/confignode1/data
 consensus_dir=target/confignode1/consensus
diff --git a/confignode/src/test/resources/confignode2conf/iotdb-confignode.properties b/confignode/src/test/resources/confignode2conf/iotdb-confignode.properties
index 4b76839b60..66c6045d59 100644
--- a/confignode/src/test/resources/confignode2conf/iotdb-confignode.properties
+++ b/confignode/src/test/resources/confignode2conf/iotdb-confignode.properties
@@ -17,14 +17,14 @@
 # under the License.
 #
 
-internal_address=0.0.0.0
+internal_address=127.0.0.1
 internal_port=22279
 consensus_port=22280
-target_config_nodes=0.0.0.0:22277
-config_node_consensus_protocol_class=org.apache.iotdb.consensus.ratis.RatisConsensus
-data_region_consensus_protocol_class=org.apache.iotdb.consensus.ratis.RatisConsensus
+target_config_nodes=127.0.0.1:22277
+data_region_consensus_protocol_class=org.apache.iotdb.consensus.multileader.MultiLeaderConsensus
 schema_region_consensus_protocol_class=org.apache.iotdb.consensus.ratis.RatisConsensus
-
+schema_replication_factor=3
+data_replication_factor=3
 system_dir=target/confignode2/system
 data_dirs=target/confignode2/data
 consensus_dir=target/confignode2/consensus
diff --git a/confignode/src/test/resources/confignode3conf/iotdb-confignode.properties b/confignode/src/test/resources/confignode3conf/iotdb-confignode.properties
index 5fe10d60e2..0d53e4a6dd 100644
--- a/confignode/src/test/resources/confignode3conf/iotdb-confignode.properties
+++ b/confignode/src/test/resources/confignode3conf/iotdb-confignode.properties
@@ -17,14 +17,14 @@
 # under the License.
 #
 
-internal_address=0.0.0.0
+internal_address=127.0.0.1
 internal_port=22281
 consensus_port=22282
-target_config_nodes=0.0.0.0:22277
-config_node_consensus_protocol_class=org.apache.iotdb.consensus.ratis.RatisConsensus
-data_region_consensus_protocol_class=org.apache.iotdb.consensus.ratis.RatisConsensus
+target_config_nodes=127.0.0.1:22277
+data_region_consensus_protocol_class=org.apache.iotdb.consensus.multileader.MultiLeaderConsensus
 schema_region_consensus_protocol_class=org.apache.iotdb.consensus.ratis.RatisConsensus
-
+schema_replication_factor=3
+data_replication_factor=3
 system_dir=target/confignode3/system
 data_dirs=target/confignode3/data
 consensus_dir=target/confignode3/consensus
diff --git a/server/src/test/resources/datanode1conf/iotdb-rest.properties b/server/src/test/resources/datanode1conf/iotdb-rest.properties
new file mode 100644
index 0000000000..b7f426f745
--- /dev/null
+++ b/server/src/test/resources/datanode1conf/iotdb-rest.properties
@@ -0,0 +1,61 @@
+#
+# 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.
+#
+
+####################
+### REST Service Configuration
+####################
+
+# Is the REST service enabled
+# enable_rest_service=false
+
+# the binding port of the REST service
+# rest_service_port=18080
+
+# the default row limit to a REST query response when the rowSize parameter is not given in request
+# rest_query_default_row_size_limit=10000
+
+# the expiration time of the user login information cache (in seconds)
+# cache_expire_in_seconds=28800
+
+# maximum number of users can be stored in the user login cache.
+# cache_max_num=100
+
+# init capacity of users can be stored in the user login cache.
+# cache_init_num=10
+
+# is SSL enabled
+# enable_https=false
+
+# SSL key store path
+# key_store_path=
+
+# SSL key store password
+# key_store_pwd=
+
+# Is client authentication required
+# client_auth=false
+
+# SSL trust store path
+# trust_store_path=
+
+# SSL trust store password.
+# trust_store_pwd=
+
+# SSL timeout (in seconds)
+# idle_timeout_in_seconds=50000
diff --git a/server/src/test/resources/datanode2conf/iotdb-rest.properties b/server/src/test/resources/datanode2conf/iotdb-rest.properties
new file mode 100644
index 0000000000..b7f426f745
--- /dev/null
+++ b/server/src/test/resources/datanode2conf/iotdb-rest.properties
@@ -0,0 +1,61 @@
+#
+# 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.
+#
+
+####################
+### REST Service Configuration
+####################
+
+# Is the REST service enabled
+# enable_rest_service=false
+
+# the binding port of the REST service
+# rest_service_port=18080
+
+# the default row limit to a REST query response when the rowSize parameter is not given in request
+# rest_query_default_row_size_limit=10000
+
+# the expiration time of the user login information cache (in seconds)
+# cache_expire_in_seconds=28800
+
+# maximum number of users can be stored in the user login cache.
+# cache_max_num=100
+
+# init capacity of users can be stored in the user login cache.
+# cache_init_num=10
+
+# is SSL enabled
+# enable_https=false
+
+# SSL key store path
+# key_store_path=
+
+# SSL key store password
+# key_store_pwd=
+
+# Is client authentication required
+# client_auth=false
+
+# SSL trust store path
+# trust_store_path=
+
+# SSL trust store password.
+# trust_store_pwd=
+
+# SSL timeout (in seconds)
+# idle_timeout_in_seconds=50000
diff --git a/server/src/test/resources/datanode3conf/iotdb-rest.properties b/server/src/test/resources/datanode3conf/iotdb-rest.properties
new file mode 100644
index 0000000000..b7f426f745
--- /dev/null
+++ b/server/src/test/resources/datanode3conf/iotdb-rest.properties
@@ -0,0 +1,61 @@
+#
+# 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.
+#
+
+####################
+### REST Service Configuration
+####################
+
+# Is the REST service enabled
+# enable_rest_service=false
+
+# the binding port of the REST service
+# rest_service_port=18080
+
+# the default row limit to a REST query response when the rowSize parameter is not given in request
+# rest_query_default_row_size_limit=10000
+
+# the expiration time of the user login information cache (in seconds)
+# cache_expire_in_seconds=28800
+
+# maximum number of users can be stored in the user login cache.
+# cache_max_num=100
+
+# init capacity of users can be stored in the user login cache.
+# cache_init_num=10
+
+# is SSL enabled
+# enable_https=false
+
+# SSL key store path
+# key_store_path=
+
+# SSL key store password
+# key_store_pwd=
+
+# Is client authentication required
+# client_auth=false
+
+# SSL trust store path
+# trust_store_path=
+
+# SSL trust store password.
+# trust_store_pwd=
+
+# SSL timeout (in seconds)
+# idle_timeout_in_seconds=50000