Revert "HDDS-1596. Create service endpoint to download configuration from SCM."

This reverts commit c0499bd.

Author: elek

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

@@ -47,43 +47,19 @@ public class OzoneConfiguration extends Configuration {
   }
 
   public OzoneConfiguration() {
-    this(false);
-  }
-
-  private OzoneConfiguration(boolean justTheDefaults) {
     OzoneConfiguration.activate();
     loadDefaults();
-    if (!justTheDefaults) {
-      loadConfigFiles();
-    }
-  }
-
-  private void loadConfigFiles() {
-    addResource("ozone-global.xml");
-    addResource("ozone-site.xml");
   }
 
   public OzoneConfiguration(Configuration conf) {
-    this(conf, false);
-  }
-
-  private OzoneConfiguration(Configuration conf, boolean justTheDefaults) {
     super(conf);
     //load the configuration from the classloader of the original conf.
     setClassLoader(conf.getClassLoader());
     if (!(conf instanceof OzoneConfiguration)) {
       loadDefaults();
-      //here we load the REAL configuration.
-      if (!justTheDefaults) {
-        loadConfigFiles();
-      }
     }
   }
 
-  public static OzoneConfiguration createWithDefaultsOnly() {
-    return new OzoneConfiguration(true);
-  }
-
   private void loadDefaults() {
     try {
       //there could be multiple ozone-default-generated.xml files on the
@@ -98,6 +74,7 @@ private void loadDefaults() {
     } catch (IOException e) {
       e.printStackTrace();
     }
+    addResource("ozone-site.xml");
   }
 
   public List<Property> readPropertyFromXml(URL url) throws JAXBException {
@@ -339,9 +316,4 @@ public Properties getAllPropertiesByTag(String tag) {
     }
     return props;
   }
-
-  @Override
-  public synchronized Properties getProps() {
-    return super.getProps();
-  }
 }

hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/discovery/DiscoveryUtil.java

@@ -25,7 +25,6 @@
 import org.apache.hadoop.hdds.cli.GenericCli;
 import org.apache.hadoop.hdds.cli.HddsVersionProvider;
 import org.apache.hadoop.hdds.conf.OzoneConfiguration;
-import org.apache.hadoop.hdds.discovery.DiscoveryUtil;
 import org.apache.hadoop.hdds.protocol.DatanodeDetails;
 import org.apache.hadoop.hdds.protocol.proto.SCMSecurityProtocolProtos.SCMGetCertResponseProto;
 import org.apache.hadoop.hdds.protocolPB.SCMSecurityProtocolClientSideTranslatorPB;
@@ -141,12 +140,7 @@ public Void call() throws Exception {
       StringUtils
           .startupShutdownMessage(HddsDatanodeService.class, args, LOG);
     }
-    OzoneConfiguration ozoneConfiguration = createOzoneConfiguration();
-    if (DiscoveryUtil.loadGlobalConfig(ozoneConfiguration)) {
-      //reload the configuration with the downloaded new configs.
-      ozoneConfiguration = createOzoneConfiguration();
-    }
-    start(ozoneConfiguration);
+    start(createOzoneConfiguration());
     join();
     return null;
   }

hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/discovery/package-info.java

@@ -33,7 +33,6 @@
 import javax.servlet.http.HttpServlet;
 import java.io.IOException;
 import java.net.InetSocketAddress;
-import java.util.Map;
 import java.util.Optional;
 
 import static org.apache.hadoop.hdds.HddsUtils.getHostNameFromConfigKeys;
@@ -128,18 +127,6 @@ protected void addServlet(String servletName, String pathSpec,
     httpServer.addServlet(servletName, pathSpec, clazz);
   }
 
-  /**
-   * Add a servlet to BaseHttpServer.
-   *
-   * @param servletName The name of the servlet
-   * @param pathSpec    The path spec for the servlet
-   * @param clazz       The servlet class
-   */
-  protected void addInternalServlet(String servletName, String pathSpec,
-      Class<? extends HttpServlet> clazz, Map<String, String> initParams) {
-    httpServer.addInternalServlet(servletName, pathSpec, clazz, initParams);
-  }
-
   /**
    * Returns the WebAppContext associated with this HttpServer.
    *

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java

@@ -96,17 +96,7 @@ public static InetSocketAddress updateRPCListenAddress(
         rpcServer.getListenerAddress());
   }
 
-  public static InetSocketAddress updateRPCListenPort(
-      OzoneConfiguration conf, String rpcAddressKey,
-      InetSocketAddress listenerAddress) {
-    String originalValue = conf.get(rpcAddressKey);
-    //remove existing port
-    originalValue = originalValue.replaceAll(":.*", "");
-    conf.set(rpcAddressKey,
-        originalValue + ":" + listenerAddress.getPort());
-    return new InetSocketAddress(originalValue,
-        listenerAddress.getPort());
-  }
+
   /**
    * After starting an server, updates configuration with the actual
    * listening address of that server. The listening address may be different

hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/BaseHttpServer.java

@@ -23,14 +23,11 @@
 import org.apache.hadoop.hdds.conf.OzoneConfiguration;
 import org.apache.hadoop.hdds.scm.ScmConfigKeys;
 import org.apache.hadoop.test.PathUtils;
-
-import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
 import java.io.File;
-import java.net.InetSocketAddress;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -123,18 +120,4 @@ public void ozoneMetadataDirRejectsList() {
     ServerUtils.getOzoneMetaDirPath(conf);
   }
 
-  @Test
-  public void updateRpcListenPort() {
-    OzoneConfiguration conf = new OzoneConfiguration();
-
-    conf.set("test1", "localhost:0");
-    ServerUtils.updateRPCListenPort(conf, "test1",
-        new InetSocketAddress("0.0.0.0", 1234));
-    Assert.assertEquals("localhost:1234", conf.get("test1"));
-
-    conf.set("test2", "localhost");
-    ServerUtils.updateRPCListenPort(conf, "test2",
-        new InetSocketAddress("0.0.0.0", 1234));
-    Assert.assertEquals("localhost:1234", conf.get("test2"));
-  }
 }

hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/ServerUtils.java

@@ -191,27 +191,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
         <version>${bouncycastle.version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>com.sun.xml.bind</groupId>
-        <artifactId>jaxb-impl</artifactId>
-        <version>2.3.0.1</version>
-      </dependency>
-      <dependency>
-        <groupId>com.sun.xml.bind</groupId>
-        <artifactId>jaxb-core</artifactId>
-        <version>2.3.0.1</version>
-      </dependency>
-      <dependency>
-        <groupId>javax.xml.bind</groupId>
-        <artifactId>jaxb-api</artifactId>
-        <version>2.3.0</version>
-      </dependency>
-      <dependency>
-        <groupId>javax.activation</groupId>
-        <artifactId>activation</artifactId>
-        <version>1.1.1</version>
-      </dependency>
-
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter-api</artifactId>

hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/server/TestServerUtils.java

@@ -54,24 +54,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
       <artifactId>hadoop-hdds-docs</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-impl</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>javax.activation</groupId>
-      <artifactId>activation</artifactId>
-    </dependency>
-
-
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-hdds-container-service</artifactId>