OneSizeFitsQuorum commented on code in PR #12626:
URL: https://github.com/apache/iotdb/pull/12626#discussion_r1630860976
##########
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/audit/AuditLogger.java:
##########
@@ -228,6 +228,7 @@ private static AuditLogOperation
judgeLogOperation(StatementType type) {
case INTERNAL_CREATE_TIMESERIES:
case START_REPAIR_DATA:
case STOP_REPAIR_DATA:
+ case SET_CONFIGURATION:
Review Comment:
lack show_CONFIGURATION
##########
iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/client/sync/SyncDataNodeClientPool.java:
##########
@@ -187,6 +190,19 @@ public TRegionLeaderChangeResp changeRegionLeader(
return new TRegionLeaderChangeResp(status, -1L);
}
+ public TShowConfigurationResp showConfiguration(TEndPoint dataNode) {
Review Comment:
delete
##########
iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java:
##########
@@ -1496,6 +1502,39 @@ public TSStatus clearCache() {
: status;
}
+ @Override
+ public TSStatus setConfiguration(TSetConfigurationReq req) {
+ TSStatus tsStatus = new
TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode());
+ int currentNodeId = CONF.getConfigNodeId();
+ if (req.getNodeId() < 0 || currentNodeId == req.getNodeId()) {
+ URL url =
ConfigNodeDescriptor.getPropsUrl(CommonConfig.SYSTEM_CONFIG_NAME);
Review Comment:
drop unnecessary check
##########
iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/ConfigurationFileUtils.java:
##########
@@ -0,0 +1,264 @@
+/*
+ * 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.commons.conf;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.RandomAccessFile;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+public class ConfigurationFileUtils {
+
+ private static final String lockFileSuffix = ".lock";
+ private static final long maxTimeMillsToAcquireLock =
TimeUnit.SECONDS.toMillis(20);
+ private static final long waitTimeMillsPerCheck =
TimeUnit.MILLISECONDS.toMillis(100);
+ private static Logger logger =
LoggerFactory.getLogger(ConfigurationFileUtils.class);
+ private static String license =
+ "#\n"
+ + "# Licensed to the Apache Software Foundation (ASF) under one\n"
+ + "# or more contributor license agreements. See the NOTICE file\n"
+ + "# distributed with this work for additional information\n"
+ + "# regarding copyright ownership. The ASF licenses this file\n"
+ + "# to you under the Apache License, Version 2.0 (the\n"
+ + "# \"License\"); you may not use this file except in compliance\n"
+ + "# with the License. You may obtain a copy of the License at\n"
+ + "#\n"
+ + "# http://www.apache.org/licenses/LICENSE-2.0\n";
+ + "#\n"
+ + "# Unless required by applicable law or agreed to in writing,\n"
+ + "# software distributed under the License is distributed on an\n"
+ + "# \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n"
+ + "# KIND, either express or implied. See the License for the\n"
+ + "# specific language governing permissions and limitations\n"
+ + "# under the License.";
+
+ // This is a temporary implementations
+ private static final Set<String> ignoreConfigKeys =
+ new HashSet<>(
+ Arrays.asList(
+ "cn_internal_address",
+ "cn_internal_port",
+ "cn_consensus_port",
+ "cn_seed_config_node",
+ "dn_internal_address",
+ "dn_internal_port",
+ "dn_mpp_data_exchange_port",
+ "dn_schema_region_consensus_port",
+ "dn_data_region_consensus_port",
+ "dn_seed_config_node",
+ "dn_session_timeout_threshold",
+ "config_node_consensus_protocol_class",
+ "schema_replication_factor",
+ "data_replication_factor",
+ "data_region_consensus_protocol_class",
+ "series_slot_num",
+ "series_partition_executor_class",
+ "time_partition_interval",
+ "schema_engine_mode",
+ "tag_attribute_flush_interval",
Review Comment:
checked in next pr
##########
iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/ConfigurationFileUtils.java:
##########
@@ -0,0 +1,264 @@
+/*
+ * 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.commons.conf;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.RandomAccessFile;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+public class ConfigurationFileUtils {
+
+ private static final String lockFileSuffix = ".lock";
+ private static final long maxTimeMillsToAcquireLock =
TimeUnit.SECONDS.toMillis(20);
+ private static final long waitTimeMillsPerCheck =
TimeUnit.MILLISECONDS.toMillis(100);
+ private static Logger logger =
LoggerFactory.getLogger(ConfigurationFileUtils.class);
+ private static String license =
+ "#\n"
+ + "# Licensed to the Apache Software Foundation (ASF) under one\n"
+ + "# or more contributor license agreements. See the NOTICE file\n"
+ + "# distributed with this work for additional information\n"
+ + "# regarding copyright ownership. The ASF licenses this file\n"
+ + "# to you under the Apache License, Version 2.0 (the\n"
+ + "# \"License\"); you may not use this file except in compliance\n"
+ + "# with the License. You may obtain a copy of the License at\n"
+ + "#\n"
+ + "# http://www.apache.org/licenses/LICENSE-2.0\n";
+ + "#\n"
+ + "# Unless required by applicable law or agreed to in writing,\n"
+ + "# software distributed under the License is distributed on an\n"
+ + "# \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n"
+ + "# KIND, either express or implied. See the License for the\n"
+ + "# specific language governing permissions and limitations\n"
+ + "# under the License.";
+
+ // This is a temporary implementations
+ private static final Set<String> ignoreConfigKeys =
+ new HashSet<>(
+ Arrays.asList(
+ "cn_internal_address",
+ "cn_internal_port",
+ "cn_consensus_port",
+ "cn_seed_config_node",
+ "dn_internal_address",
+ "dn_internal_port",
+ "dn_mpp_data_exchange_port",
+ "dn_schema_region_consensus_port",
+ "dn_data_region_consensus_port",
+ "dn_seed_config_node",
+ "dn_session_timeout_threshold",
+ "config_node_consensus_protocol_class",
+ "schema_replication_factor",
+ "data_replication_factor",
+ "data_region_consensus_protocol_class",
+ "series_slot_num",
+ "series_partition_executor_class",
+ "time_partition_interval",
+ "schema_engine_mode",
+ "tag_attribute_flush_interval",
+ "tag_attribute_total_size",
+ "timestamp_precision",
+ "iotdb_server_encrypt_decrypt_provider",
+ "iotdb_server_encrypt_decrypt_provider_parameter"));
+
+ public static void checkAndMayUpdate(
+ URL systemUrl, URL configNodeUrl, URL dataNodeUrl, URL commonUrl)
+ throws IOException, InterruptedException {
+ if (systemUrl == null || configNodeUrl == null || dataNodeUrl == null ||
commonUrl == null) {
+ return;
+ }
+ File systemFile = new File(systemUrl.getFile());
+ File configNodeFile = new File(configNodeUrl.getFile());
+ File dataNodeFile = new File(dataNodeUrl.getFile());
+ File commonFile = new File(commonUrl.getFile());
+
+ if (systemFile.exists()) {
+ return;
+ }
+ boolean canUpdate = (configNodeFile.exists() || dataNodeFile.exists()) &&
commonFile.exists();
+ if (!canUpdate) {
+ return;
+ }
+
+ File lockFile = new File(systemFile.getPath() + lockFileSuffix);
+ acquireTargetFileLock(lockFile);
+ try {
+ // other progress updated this file
+ if (systemFile.exists()) {
+ return;
+ }
+ try (RandomAccessFile raf = new RandomAccessFile(lockFile, "rw")) {
+ raf.write(license.getBytes());
+ String configNodeContent =
readConfigLinesWithoutLicense(configNodeFile);
+ raf.write(configNodeContent.getBytes());
+ String dataNodeContent = readConfigLinesWithoutLicense(dataNodeFile);
+ raf.write(dataNodeContent.getBytes());
+ String commonContent = readConfigLinesWithoutLicense(commonFile);
+ raf.write(commonContent.getBytes());
+ }
+ Files.move(lockFile.toPath(), systemFile.toPath());
+ } finally {
+ releaseFileLock(lockFile);
+ }
+ }
+
+ public static String readConfigFileContent(URL url) throws IOException {
+ if (url == null) {
+ return "";
+ }
+ File f = new File(url.getFile());
+ if (!f.exists()) {
+ return "";
+ }
+ return readConfigLines(f);
+ }
+
+ public static String readConfigurationTemplateFile() throws IOException {
+ StringBuilder content = new StringBuilder();
+ try (InputStream inputStream =
+ ConfigurationFileUtils.class
+ .getClassLoader()
+ .getResourceAsStream(CommonConfig.SYSTEM_CONFIG_NAME);
+ InputStreamReader isr = new InputStreamReader(inputStream);
+ BufferedReader reader = new BufferedReader(isr)) {
+ String line;
+ while ((line = reader.readLine()) != null) {
+ content.append(line).append(System.lineSeparator());
+ }
+ } catch (IOException e) {
+ logger.warn("Failed to read configuration template", e);
+ throw e;
+ }
+ return content.toString();
+ }
+
+ public static List<String> filterImmutableConfigItems(Properties
newConfigItems) {
+ List<String> ignoredConfigItems = new ArrayList<>();
+ for (String ignoredKey : ignoreConfigKeys) {
+ if (newConfigItems.containsKey(ignoredKey)) {
+ newConfigItems.remove(ignoredKey);
+ ignoredConfigItems.add(ignoredKey);
+ }
+ }
+ return ignoredConfigItems;
+ }
+
+ public static void updateConfigurationFile(File file, Properties
newConfigItems)
+ throws IOException, InterruptedException {
+ logger.info("Updating configuration file {}", file.getAbsolutePath());
+ File lockFile = new File(file.getPath() + lockFileSuffix);
+ acquireTargetFileLock(lockFile);
+ try {
+ List<String> lines = new ArrayList<>();
+ try (BufferedReader reader = new BufferedReader(new FileReader(file))) {
+ String line = null;
+ while ((line = reader.readLine()) != null) {
+ lines.add(line);
+ }
+ }
+ try (FileWriter writer = new FileWriter(lockFile)) {
Review Comment:
create when really need creating new configuration file
##########
iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/ConfigurationFileUtils.java:
##########
@@ -0,0 +1,264 @@
+/*
+ * 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.commons.conf;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.RandomAccessFile;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+public class ConfigurationFileUtils {
+
+ private static final String lockFileSuffix = ".lock";
+ private static final long maxTimeMillsToAcquireLock =
TimeUnit.SECONDS.toMillis(20);
+ private static final long waitTimeMillsPerCheck =
TimeUnit.MILLISECONDS.toMillis(100);
+ private static Logger logger =
LoggerFactory.getLogger(ConfigurationFileUtils.class);
+ private static String license =
+ "#\n"
+ + "# Licensed to the Apache Software Foundation (ASF) under one\n"
+ + "# or more contributor license agreements. See the NOTICE file\n"
+ + "# distributed with this work for additional information\n"
+ + "# regarding copyright ownership. The ASF licenses this file\n"
+ + "# to you under the Apache License, Version 2.0 (the\n"
+ + "# \"License\"); you may not use this file except in compliance\n"
+ + "# with the License. You may obtain a copy of the License at\n"
+ + "#\n"
+ + "# http://www.apache.org/licenses/LICENSE-2.0\n";
+ + "#\n"
+ + "# Unless required by applicable law or agreed to in writing,\n"
+ + "# software distributed under the License is distributed on an\n"
+ + "# \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n"
+ + "# KIND, either express or implied. See the License for the\n"
+ + "# specific language governing permissions and limitations\n"
+ + "# under the License.";
+
+ // This is a temporary implementations
+ private static final Set<String> ignoreConfigKeys =
+ new HashSet<>(
+ Arrays.asList(
+ "cn_internal_address",
+ "cn_internal_port",
+ "cn_consensus_port",
+ "cn_seed_config_node",
+ "dn_internal_address",
+ "dn_internal_port",
+ "dn_mpp_data_exchange_port",
+ "dn_schema_region_consensus_port",
+ "dn_data_region_consensus_port",
+ "dn_seed_config_node",
+ "dn_session_timeout_threshold",
+ "config_node_consensus_protocol_class",
+ "schema_replication_factor",
+ "data_replication_factor",
+ "data_region_consensus_protocol_class",
+ "series_slot_num",
+ "series_partition_executor_class",
+ "time_partition_interval",
+ "schema_engine_mode",
+ "tag_attribute_flush_interval",
+ "tag_attribute_total_size",
+ "timestamp_precision",
+ "iotdb_server_encrypt_decrypt_provider",
+ "iotdb_server_encrypt_decrypt_provider_parameter"));
+
+ public static void checkAndMayUpdate(
+ URL systemUrl, URL configNodeUrl, URL dataNodeUrl, URL commonUrl)
+ throws IOException, InterruptedException {
+ if (systemUrl == null || configNodeUrl == null || dataNodeUrl == null ||
commonUrl == null) {
+ return;
+ }
+ File systemFile = new File(systemUrl.getFile());
+ File configNodeFile = new File(configNodeUrl.getFile());
+ File dataNodeFile = new File(dataNodeUrl.getFile());
+ File commonFile = new File(commonUrl.getFile());
+
+ if (systemFile.exists()) {
+ return;
+ }
+ boolean canUpdate = (configNodeFile.exists() || dataNodeFile.exists()) &&
commonFile.exists();
+ if (!canUpdate) {
+ return;
+ }
+
+ File lockFile = new File(systemFile.getPath() + lockFileSuffix);
+ acquireTargetFileLock(lockFile);
+ try {
+ // other progress updated this file
+ if (systemFile.exists()) {
+ return;
+ }
+ try (RandomAccessFile raf = new RandomAccessFile(lockFile, "rw")) {
+ raf.write(license.getBytes());
+ String configNodeContent =
readConfigLinesWithoutLicense(configNodeFile);
+ raf.write(configNodeContent.getBytes());
+ String dataNodeContent = readConfigLinesWithoutLicense(dataNodeFile);
+ raf.write(dataNodeContent.getBytes());
+ String commonContent = readConfigLinesWithoutLicense(commonFile);
+ raf.write(commonContent.getBytes());
+ }
+ Files.move(lockFile.toPath(), systemFile.toPath());
+ } finally {
+ releaseFileLock(lockFile);
+ }
+ }
+
+ public static String readConfigFileContent(URL url) throws IOException {
+ if (url == null) {
+ return "";
+ }
+ File f = new File(url.getFile());
+ if (!f.exists()) {
+ return "";
+ }
+ return readConfigLines(f);
+ }
+
+ public static String readConfigurationTemplateFile() throws IOException {
+ StringBuilder content = new StringBuilder();
+ try (InputStream inputStream =
+ ConfigurationFileUtils.class
+ .getClassLoader()
+ .getResourceAsStream(CommonConfig.SYSTEM_CONFIG_NAME);
+ InputStreamReader isr = new InputStreamReader(inputStream);
+ BufferedReader reader = new BufferedReader(isr)) {
+ String line;
+ while ((line = reader.readLine()) != null) {
+ content.append(line).append(System.lineSeparator());
+ }
+ } catch (IOException e) {
+ logger.warn("Failed to read configuration template", e);
+ throw e;
+ }
+ return content.toString();
+ }
+
+ public static List<String> filterImmutableConfigItems(Properties
newConfigItems) {
+ List<String> ignoredConfigItems = new ArrayList<>();
+ for (String ignoredKey : ignoreConfigKeys) {
+ if (newConfigItems.containsKey(ignoredKey)) {
+ newConfigItems.remove(ignoredKey);
+ ignoredConfigItems.add(ignoredKey);
+ }
+ }
+ return ignoredConfigItems;
+ }
+
+ public static void updateConfigurationFile(File file, Properties
newConfigItems)
+ throws IOException, InterruptedException {
+ logger.info("Updating configuration file {}", file.getAbsolutePath());
Review Comment:
log when really need creating new configuration file
##########
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/StorageEngine.java:
##########
@@ -602,6 +607,48 @@ public void clearCache() {
BloomFilterCache.getInstance().clear();
}
+ public TSStatus setConfiguration(TSetConfigurationReq req) {
+ Map<String, String> newConfigItems = req.getConfigs();
+ Properties properties = new Properties();
+ properties.putAll(newConfigItems);
+ TSStatus tsStatus = new
TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode());
+ List<String> ignoredConfigItems =
ConfigurationFileUtils.filterImmutableConfigItems(properties);
+ if (!ignoredConfigItems.isEmpty()) {
+ tsStatus.setMessage("ignored config items: " + ignoredConfigItems);
+ tsStatus.setCode(TSStatusCode.EXECUTE_STATEMENT_ERROR.getStatusCode());
+ }
+
+ if (newConfigItems.isEmpty()) {
Review Comment:
bug
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscr...@iotdb.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
