[GitHub] [ignite-3] tkalkirill commented on a diff in pull request #2058: IGNITE-19315 Validate node configuration on node start

["tkalkirill (via GitHub)" <gi...@apache.org>]

tkalkirill commented on code in PR #2058:
URL: https://github.com/apache/ignite-3/pull/2058#discussion_r1192266124


##########
modules/configuration/src/main/java/org/apache/ignite/internal/configuration/ConfigurationChanger.java:
##########
@@ -274,11 +274,30 @@ public void start() throws ConfigurationChangeException {
         //Workaround for distributed configuration.
         addDefaults(superRoot);
 
+        // Validate the restored configuration.
+        validateConfiguration(defaultConfiguration(), superRoot);
+
         storageRoots = new StorageRoots(superRoot, data.changeId());
 
         storage.registerConfigurationListener(configurationStorageListener());
     }
 
+    /**
+     * Creates an empty configuration with defaults.
+     *
+     * @return Default configuration.
+     */
+    private SuperRoot defaultConfiguration() {

Review Comment:
   There may be no default values, what happens then?



##########
modules/configuration/src/test/java/org/apache/ignite/internal/configuration/ConfigurationChangerTest.java:
##########
@@ -95,12 +96,12 @@ public static class FirstConfigurationSchema {
      */
     @Config
     public static class SecondConfigurationSchema {
-        @Value
+        @Value(hasDefault = true)
         @Immutable
-        public int intCfg;
+        public int intCfg = 0;
 
-        @Value
-        public String strCfg;
+        @Value(hasDefault = true)
+        public String strCfg = "";
     }

Review Comment:
   I think we can add fields with default values instead of adding default values for the current ones.



##########
modules/configuration/src/test/java/org/apache/ignite/internal/configuration/ConfigurationRegistryTest.java:
##########
@@ -370,16 +370,16 @@ public static class FourthPolymorphicConfigurationSchema {
         @PolymorphicId(hasDefault = true)
         public String typeId = "fourth0";
 
-        @Value
-        public String strVal;
+        @Value(hasDefault = true)
+        public String strVal = "";
     }
 
     /**
      * First {@link FourthPolymorphicConfigurationSchema} extension.
      */
     @PolymorphicConfigInstance("fourth0")
     public static class Fourth0PolymorphicConfigurationSchema extends FourthPolymorphicConfigurationSchema {
-        @Value
-        public int intVal;
+        @Value(hasDefault = true)

Review Comment:
   Same



##########
modules/runner/src/main/java/org/apache/ignite/internal/configuration/NodeConfigParseException.java:
##########
@@ -0,0 +1,31 @@
+/*
+ * 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.ignite.internal.configuration;
+
+import org.apache.ignite.lang.ErrorGroups.NodeConfiguration;
+import org.apache.ignite.lang.IgniteException;
+
+/**
+ * Throws when node bootstrap configuration file failed to parse.
+ */
+public class NodeConfigParseException extends IgniteException {

Review Comment:
   ```suggestion
   public class ConfigurationParseException extends IgniteException {
   ```



##########
modules/configuration/src/test/java/org/apache/ignite/internal/configuration/ConfigurationRegistryTest.java:
##########
@@ -370,16 +370,16 @@ public static class FourthPolymorphicConfigurationSchema {
         @PolymorphicId(hasDefault = true)
         public String typeId = "fourth0";
 
-        @Value
-        public String strVal;
+        @Value(hasDefault = true)

Review Comment:
   Same



##########
modules/runner/src/main/java/org/apache/ignite/internal/configuration/NodeConfigParseException.java:
##########
@@ -0,0 +1,31 @@
+/*
+ * 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.ignite.internal.configuration;
+
+import org.apache.ignite.lang.ErrorGroups.NodeConfiguration;
+import org.apache.ignite.lang.IgniteException;
+
+/**
+ * Throws when node bootstrap configuration file failed to parse.
+ */
+public class NodeConfigParseException extends IgniteException {
+
+    public NodeConfigParseException(String msg, Throwable cause) {

Review Comment:
   Missing javadoc



-- 
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: notifications-unsubscribe@ignite.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org