HDDS-6075. OzoneConfiguration constructor overrides input configuration keys.

hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java

@@ -108,6 +108,7 @@ public OzoneConfiguration(Configuration conf) {
     setClassLoader(conf.getClassLoader());
     if (!(conf instanceof OzoneConfiguration)) {
       loadDefaults();
+      addResource(conf);
     }
   }
 
@@ -125,6 +126,7 @@ private void loadDefaults() {
     } catch (IOException e) {
       e.printStackTrace();
     }
+    addResource("ozone-default.xml");
     // Adding core-site here because properties from core-site are
     // distributed to executors by spark driver. Ozone properties which are
     // added to core-site, will be overridden by properties from adding Resource
@@ -241,7 +243,6 @@ public static void activate() {
     // adds the default resources
     Configuration.addDefaultResource("hdfs-default.xml");
     Configuration.addDefaultResource("hdfs-site.xml");
-    Configuration.addDefaultResource("ozone-default.xml");
   }
 
   /**

hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/conf/TestOzoneConfiguration.java

@@ -22,9 +22,11 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
+import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
 
 import org.junit.Assert;
@@ -190,6 +192,32 @@ public void setConfigFromObjectWithConfigDefaults() {
         subject.getTimeDuration("test.scm.client.wait", 555, TimeUnit.SECONDS));
   }
 
+  @Test
+  public void testInstantiationWithInputConfiguration() throws IOException {
+    String key = "hdds.scm.init.default.layout.version";
+    String val = "Test1";
+    Configuration configuration = new Configuration(true);
+
+    File ozoneSite = tempConfigs.newFile("ozone-site.xml");
+    FileOutputStream ozoneSiteStream = new FileOutputStream(ozoneSite);
+    try (BufferedWriter out = new BufferedWriter(new OutputStreamWriter(
+        ozoneSiteStream, StandardCharsets.UTF_8))) {
+      startConfig(out);
+      appendProperty(out, key, val);
+      endConfig(out);
+    }
+    configuration
+        .addResource(new URL("file:///" + ozoneSite.getAbsolutePath()));
+
+    OzoneConfiguration ozoneConfiguration =
+        new OzoneConfiguration(configuration);
+    // ozoneConfig value matches input config value for the corresponding key
+    Assert.assertEquals(val, ozoneConfiguration.get(key));
+    Assert.assertEquals(val, configuration.get(key));
+
+    Assert.assertNotEquals(val, new OzoneConfiguration().get(key));
+  }
+
   @Test
   public void setConfigFromObjectWithObjectDefaults() {
     // GIVEN