Skip to content

Commit 5171ce4

Browse files
committed
applied review comments
1 parent 9b73296 commit 5171ce4

2 files changed

Lines changed: 13 additions & 5 deletions

File tree

iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ private void loadProps() {
146146
}
147147
}
148148

149-
private void loadProperties(TrimProperties properties) throws BadNodeUrlException, IOException {
149+
private void loadProperties(TrimProperties properties) throws BadNodeUrlException {
150150
ConfigurationFileUtils.updateAppliedProperties(properties, false);
151151
conf.setClusterName(properties.getProperty(IoTDBConstant.CLUSTER_NAME, conf.getClusterName()));
152152

@@ -765,7 +765,7 @@ public boolean isSeedConfigNode() {
765765
}
766766
}
767767

768-
public void loadHotModifiedProps(TrimProperties properties) throws IOException {
768+
public void loadHotModifiedProps(TrimProperties properties) {
769769
ConfigurationFileUtils.updateAppliedProperties(properties, true);
770770
Optional.ofNullable(properties.getProperty(IoTDBConstant.CLUSTER_NAME))
771771
.ifPresent(conf::setClusterName);

iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/ConfigurationFileUtils.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,13 @@ public class ConfigurationFileUtils {
7878

7979
private static final Map<String, String> lastAppliedProperties = new HashMap<>();
8080

81-
public static void updateAppliedProperties(TrimProperties properties, boolean isHotReloading)
82-
throws IOException {
83-
loadConfigurationDefaultValueFromTemplate();
81+
public static void updateAppliedProperties(TrimProperties properties, boolean isHotReloading) {
82+
try {
83+
loadConfigurationDefaultValueFromTemplate();
84+
} catch (IOException e) {
85+
logger.error("Failed to update applied properties", e);
86+
return;
87+
}
8488
for (Map.Entry<Object, Object> entry : properties.entrySet()) {
8589
String key = entry.getKey().toString();
8690
DefaultConfigurationItem defaultConfigurationItem = configuration2DefaultValue.get(key);
@@ -382,6 +386,10 @@ public static Map<String, DefaultConfigurationItem> getConfigurationItemsFromTem
382386
}
383387
} else {
384388
int equalsIndex = line.indexOf('=');
389+
if (equalsIndex == -1) {
390+
// Skip lines without '=' to avoid StringIndexOutOfBoundsException
391+
continue;
392+
}
385393
String key = line.substring(0, equalsIndex).trim();
386394
String value = line.substring(equalsIndex + 1).trim();
387395
for (String independentLine : independentLines) {

0 commit comments

Comments
 (0)