HDDS-2366. Remove ozone.enabled as a flag and config item.

hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java

@@ -62,8 +62,6 @@
 import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_DATANODE_DNS_INTERFACE_KEY;
 import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_DATANODE_DNS_NAMESERVER_KEY;
 import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_DATANODE_HOST_NAME_KEY;
-import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ENABLED;
-import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ENABLED_DEFAULT;
 
 import org.apache.hadoop.security.UserGroupInformation;
 import org.slf4j.Logger;
@@ -322,12 +320,7 @@ public static Collection<InetSocketAddress> getSCMAddresses(
     }
     return addresses;
   }
-
-  public static boolean isHddsEnabled(Configuration conf) {
-    return conf.getBoolean(OZONE_ENABLED, OZONE_ENABLED_DEFAULT);
-  }
-
-
+
   /**
    * Returns the hostname for this datanode. If the hostname is not
    * explicitly configured in the given config, then it is determined

hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java

@@ -74,9 +74,6 @@ public final class OzoneConfigKeys {
       "dfs.container.ratis.ipc.random.port";
   public static final boolean DFS_CONTAINER_RATIS_IPC_RANDOM_PORT_DEFAULT =
       false;
-  public static final String OZONE_ENABLED =
-      "ozone.enabled";
-  public static final boolean OZONE_ENABLED_DEFAULT = false;
   public static final String OZONE_TRACE_ENABLED_KEY =
       "ozone.trace.enabled";
   public static final boolean OZONE_TRACE_ENABLED_DEFAULT = false;

hadoop-hdds/common/src/main/resources/ozone-default.xml

@@ -476,20 +476,6 @@
     <description>Socket timeout for Ozone client. Unit could be defined with
       postfix (ns,ms,s,m,h,d)</description>
   </property>
-  <property>
-    <name>ozone.enabled</name>
-    <value>false</value>
-    <tag>OZONE, REQUIRED</tag>
-    <description>
-      Status of the Ozone Object Storage service is enabled.
-      Set to true to enable Ozone.
-      Set to false to disable Ozone.
-      Unless this value is set to true, Ozone services will not be started in
-      the cluster.
-
-      Please note: By default ozone is disabled on a hadoop cluster.
-    </description>
-  </property>
   <property>
     <name>ozone.key.deleting.limit.per.task</name>
     <value>1000</value>

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

@@ -171,62 +171,60 @@ public void start(OzoneConfiguration configuration) {
   public void start() {
     OzoneConfiguration.activate();
     HddsUtils.initializeMetrics(conf, "HddsDatanode");
-    if (HddsUtils.isHddsEnabled(conf)) {
-      try {
-        String hostname = HddsUtils.getHostName(conf);
-        String ip = InetAddress.getByName(hostname).getHostAddress();
-        datanodeDetails = initializeDatanodeDetails();
-        datanodeDetails.setHostName(hostname);
-        datanodeDetails.setIpAddress(ip);
-        TracingUtil.initTracing(
-            "HddsDatanodeService." + datanodeDetails.getUuidString()
-                .substring(0, 8));
-        LOG.info("HddsDatanodeService host:{} ip:{}", hostname, ip);
-        // Authenticate Hdds Datanode service if security is enabled
-        if (OzoneSecurityUtil.isSecurityEnabled(conf)) {
-          component = "dn-" + datanodeDetails.getUuidString();
-
-          dnCertClient = new DNCertificateClient(new SecurityConfig(conf),
-              datanodeDetails.getCertSerialId());
-
-          if (SecurityUtil.getAuthenticationMethod(conf).equals(
-              UserGroupInformation.AuthenticationMethod.KERBEROS)) {
-            LOG.info("Ozone security is enabled. Attempting login for Hdds " +
-                    "Datanode user. Principal: {},keytab: {}", conf.get(
-                DFSConfigKeys.DFS_DATANODE_KERBEROS_PRINCIPAL_KEY),
-                conf.get(DFSConfigKeys.DFS_DATANODE_KEYTAB_FILE_KEY));
-
-            UserGroupInformation.setConfiguration(conf);
-
-            SecurityUtil.login(conf, DFSConfigKeys.DFS_DATANODE_KEYTAB_FILE_KEY,
-                DFSConfigKeys.DFS_DATANODE_KERBEROS_PRINCIPAL_KEY, hostname);
-          } else {
-            throw new AuthenticationException(SecurityUtil.
-                getAuthenticationMethod(conf) + " authentication method not " +
-                "supported. Datanode user" + " login " + "failed.");
-          }
-          LOG.info("Hdds Datanode login successful.");
-        }
-        if (OzoneSecurityUtil.isSecurityEnabled(conf)) {
-          initializeCertificateClient(conf);
-        }
-        datanodeStateMachine = new DatanodeStateMachine(datanodeDetails, conf,
-            dnCertClient, this::terminateDatanode);
-        try {
-          httpServer = new HddsDatanodeHttpServer(conf);
-          httpServer.start();
-        } catch (Exception ex) {
-          LOG.error("HttpServer failed to start.", ex);
+    try {
+      String hostname = HddsUtils.getHostName(conf);
+      String ip = InetAddress.getByName(hostname).getHostAddress();
+      datanodeDetails = initializeDatanodeDetails();
+      datanodeDetails.setHostName(hostname);
+      datanodeDetails.setIpAddress(ip);
+      TracingUtil.initTracing(
+          "HddsDatanodeService." + datanodeDetails.getUuidString()
+              .substring(0, 8));
+      LOG.info("HddsDatanodeService host:{} ip:{}", hostname, ip);
+      // Authenticate Hdds Datanode service if security is enabled
+      if (OzoneSecurityUtil.isSecurityEnabled(conf)) {
+        component = "dn-" + datanodeDetails.getUuidString();
+
+        dnCertClient = new DNCertificateClient(new SecurityConfig(conf),
+            datanodeDetails.getCertSerialId());
+
+        if (SecurityUtil.getAuthenticationMethod(conf).equals(
+            UserGroupInformation.AuthenticationMethod.KERBEROS)) {
+          LOG.info("Ozone security is enabled. Attempting login for Hdds " +
+                  "Datanode user. Principal: {},keytab: {}", conf.get(
+              DFSConfigKeys.DFS_DATANODE_KERBEROS_PRINCIPAL_KEY),
+              conf.get(DFSConfigKeys.DFS_DATANODE_KEYTAB_FILE_KEY));
+
+          UserGroupInformation.setConfiguration(conf);
+
+          SecurityUtil.login(conf, DFSConfigKeys.DFS_DATANODE_KEYTAB_FILE_KEY,
+              DFSConfigKeys.DFS_DATANODE_KERBEROS_PRINCIPAL_KEY, hostname);
+        } else {
+          throw new AuthenticationException(SecurityUtil.
+              getAuthenticationMethod(conf) + " authentication method not " +
+              "supported. Datanode user" + " login " + "failed.");
         }
-        startPlugins();
-        // Starting HDDS Daemons
-        datanodeStateMachine.startDaemon();
-      } catch (IOException e) {
-        throw new RuntimeException("Can't start the HDDS datanode plugin", e);
-      } catch (AuthenticationException ex) {
-        throw new RuntimeException("Fail to authentication when starting" +
-            " HDDS datanode plugin", ex);
+        LOG.info("Hdds Datanode login successful.");
+      }
+      if (OzoneSecurityUtil.isSecurityEnabled(conf)) {
+        initializeCertificateClient(conf);
+      }
+      datanodeStateMachine = new DatanodeStateMachine(datanodeDetails, conf,
+          dnCertClient, this::terminateDatanode);
+      try {
+        httpServer = new HddsDatanodeHttpServer(conf);
+        httpServer.start();
+      } catch (Exception ex) {
+        LOG.error("HttpServer failed to start.", ex);
       }
+      startPlugins();
+      // Starting HDDS Daemons
+      datanodeStateMachine.startDaemon();
+    } catch (IOException e) {
+      throw new RuntimeException("Can't start the HDDS datanode plugin", e);
+    } catch (AuthenticationException ex) {
+      throw new RuntimeException("Fail to authentication when starting" +
+          " HDDS datanode plugin", ex);
     }
   }
 

hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsDatanodeService.java

@@ -17,7 +17,6 @@
  */
 package org.apache.hadoop.ozone;
 
-import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ENABLED;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 
@@ -47,7 +46,6 @@ public class TestHddsDatanodeService {
   public void setUp() {
     testDir = GenericTestUtils.getRandomizedTestDir();
     conf = new OzoneConfiguration();
-    conf.setBoolean(OZONE_ENABLED, true);
     conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getPath());
     conf.setClass(OzoneConfigKeys.HDDS_DATANODE_PLUGINS_KEY, MockService.class,
         ServicePlugin.class);

hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/TestHddsSecureDatanodeInit.java

@@ -72,7 +72,6 @@ public class TestHddsSecureDatanodeInit {
   public static void setUp() throws Exception {
     testDir = GenericTestUtils.getRandomizedTestDir();
     conf = new OzoneConfiguration();
-    conf.setBoolean(OzoneConfigKeys.OZONE_ENABLED, true);
     conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getPath());
     //conf.set(ScmConfigKeys.OZONE_SCM_NAMES, "localhost");
     String volumeDir = testDir + "/disk1";

hadoop-hdds/docs/content/beyond/Containers.md

@@ -113,7 +113,6 @@ The docker-config file contains the list of the required environment variables:
 OZONE-SITE.XML_ozone.om.address=om
 OZONE-SITE.XML_ozone.om.http-address=om:9874
 OZONE-SITE.XML_ozone.scm.names=scm
-OZONE-SITE.XML_ozone.enabled=True
 #...
 ```
 

hadoop-hdds/docs/content/start/OnPrem.md

@@ -51,21 +51,6 @@ Let us look at the settings inside the generated file (ozone-site.xml) and
 how they control ozone. Once the right values are defined, this file
 needs to be copied to ```ozone directory/etc/hadoop```.
 
-
-* **ozone.enabled** This is the most critical setting for ozone.
-Ozone is a work in progress and users have to enable this service explicitly.
-By default, Ozone is disabled. Setting this flag to `true` enables ozone in the
-HDFS or Ozone cluster.
-
-Here is an example,
-
-{{< highlight xml >}}
-    <property>
-       <name>ozone.enabled</name>
-       <value>true</value>
-    </property>
-{{< /highlight >}}
-
 * **ozone.metadata.dirs** Allows Administrators to specify where the
  metadata must reside. Usually you pick your fastest disk (SSD if
  you have them on your nodes). OzoneManager, SCM and datanode will  write the
@@ -124,7 +109,6 @@ Here is an  example,
 
 | Setting                        | Value                        | Comment |
 |--------------------------------|------------------------------|------------------------------------------------------------------|
-| ozone.enabled                  | true                         | This enables SCM and  containers in HDFS cluster.                |
 | ozone.metadata.dirs            | file path                    | The metadata will be stored here.                                |
 | ozone.scm.names                | SCM server name              | Hostname:port or IP:port address of SCM.                      |
 | ozone.scm.block.client.address | SCM server name and port     | Used by services like OM                                         |

hadoop-hdds/framework/src/main/resources/webapps/datanode/dn.js

@@ -34,7 +34,6 @@
         $.get('/jmx?qry=Hadoop:service=OzoneDataNode,name=SCMConnectionManager', function (resp) {
             if (resp.beans.length > 0) {
                 data.ozone.SCMServers = resp.beans[0].SCMServers;
-                data.ozone.enabled = true;
                 render();
             }
         }).fail(show_err_msg);
@@ -44,7 +43,6 @@
         $.get('/jmx?qry=Hadoop:service=OzoneDataNode,name=ContainerLocationManager', function (resp) {
             if (resp.beans.length > 0) {
                 data.ozone.LocationReport = resp.beans[0].LocationReport;
-                data.ozone.enabled = true;
                 render();
             }
         }).fail(show_err_msg);

hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java

@@ -118,7 +118,6 @@
 import static org.apache.hadoop.hdds.scm.ScmConfigKeys.HDDS_SCM_KERBEROS_KEYTAB_FILE_KEY;
 import static org.apache.hadoop.hdds.scm.ScmConfigKeys.HDDS_SCM_KERBEROS_PRINCIPAL_KEY;
 import static org.apache.hadoop.hdds.scm.ScmConfigKeys.HDDS_SCM_WATCHER_TIMEOUT_DEFAULT;
-import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ENABLED;
 
 /**
  * StorageContainerManager is the main entry point for the service that
@@ -594,15 +593,8 @@ public static RPC.Server startRpcServer(
    * @return SCM instance
    * @throws IOException, AuthenticationException
    */
-  public static StorageContainerManager createSCM(
-      OzoneConfiguration conf)
+  public static StorageContainerManager createSCM(OzoneConfiguration conf)
       throws IOException, AuthenticationException {
-    if (!HddsUtils.isHddsEnabled(conf)) {
-      System.err.println(
-          "SCM cannot be started in secure mode or when " + OZONE_ENABLED + "" +
-              " is set to false");
-      System.exit(1);
-    }
     return new StorageContainerManager(conf);
   }
 

hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/HddsTestUtils.java

@@ -34,8 +34,6 @@
 import org.apache.hadoop.ozone.common.Storage;
 import org.apache.hadoop.security.authentication.client.AuthenticationException;
 
-import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ENABLED;
-
 /**
  * Stateless helper functions for Hdds tests.
  */
@@ -81,7 +79,6 @@ public static StorageContainerManager getScm(OzoneConfiguration conf)
     conf.set(ScmConfigKeys.OZONE_SCM_BLOCK_CLIENT_ADDRESS_KEY, "127.0.0.1:0");
     conf.set(ScmConfigKeys.OZONE_SCM_DATANODE_ADDRESS_KEY, "127.0.0.1:0");
     conf.set(ScmConfigKeys.OZONE_SCM_HTTP_ADDRESS_KEY, "127.0.0.1:0");
-    conf.setBoolean(OZONE_ENABLED, true);
     SCMStorageConfig scmStore = new SCMStorageConfig(conf);
     if(scmStore.getState() != Storage.StorageState.INITIALIZED) {
       String clusterId = UUID.randomUUID().toString();

hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestUtils.java

@@ -75,8 +75,6 @@
 import java.util.UUID;
 import java.util.concurrent.ThreadLocalRandom;
 
-import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ENABLED;
-
 /**
  * Stateless helper functions to handler scm/datanode connection.
  */
@@ -530,7 +528,6 @@ public static StorageContainerManager getScm(OzoneConfiguration conf)
   public static StorageContainerManager getScm(OzoneConfiguration conf,
                                                SCMConfigurator configurator)
       throws IOException, AuthenticationException {
-    conf.setBoolean(OZONE_ENABLED, true);
     conf.set(ScmConfigKeys.OZONE_SCM_CLIENT_ADDRESS_KEY, "127.0.0.1:0");
     conf.set(ScmConfigKeys.OZONE_SCM_BLOCK_CLIENT_ADDRESS_KEY, "127.0.0.1:0");
     conf.set(ScmConfigKeys.OZONE_SCM_DATANODE_ADDRESS_KEY, "127.0.0.1:0");

hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/block/TestDeletedBlockLog.java

@@ -70,7 +70,6 @@
 
 import static org.apache.hadoop.hdds.scm.ScmConfigKeys
     .OZONE_SCM_BLOCK_DELETION_MAX_RETRY;
-import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ENABLED;
 import static org.mockito.Matchers.anyObject;
 import static org.mockito.Mockito.when;
 
@@ -91,7 +90,6 @@ public void setup() throws Exception {
     testDir = GenericTestUtils.getTestDir(
         TestDeletedBlockLog.class.getSimpleName());
     conf = new OzoneConfiguration();
-    conf.set(OZONE_ENABLED, "true");
     conf.setInt(OZONE_SCM_BLOCK_DELETION_MAX_RETRY, 20);
     conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, testDir.getAbsolutePath());
     scm = TestUtils.getScm(conf);

hadoop-ozone/common/src/main/bin/start-ozone.sh

@@ -88,15 +88,6 @@ SECURITY_AUTHORIZATION_ENABLED=$("${HADOOP_HDFS_HOME}/bin/ozone" getconf -confKe
 #  exit 1
 #fi
 
-#---------------------------------------------------------
-# Check if ozone is enabled
-OZONE_ENABLED=$("${HADOOP_HDFS_HOME}/bin/ozone" getconf -confKey ozone.enabled | tr '[:upper:]' '[:lower:]' 2>&-)
-if [[ "${OZONE_ENABLED}" != "true" ]]; then
-  echo "Operation is not supported because ozone is not enabled."
-  exit -1
-fi
-
-#---------------------------------------------------------
 # datanodes (using default workers file)
 
 echo "Starting datanodes"

hadoop-ozone/common/src/main/bin/stop-ozone.sh

@@ -54,15 +54,6 @@ fi
 #  exit 1
 #fi
 
-#---------------------------------------------------------
-# Check if ozone is enabled
-OZONE_ENABLED=$("${HADOOP_HDFS_HOME}/bin/ozone" getconf -confKey ozone.enabled | tr '[:upper:]' '[:lower:]' 2>&-)
-if [[ "${OZONE_ENABLED}" != "true" ]]; then
-  echo "Operation is not supported because ozone is not enabled."
-  exit -1
-fi
-
-#---------------------------------------------------------
 # datanodes (using default workers file)
 
 echo "Stopping datanodes"

hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/web/utils/OzoneUtils.java

@@ -30,7 +30,6 @@
 
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hdds.HddsUtils;
 import org.apache.hadoop.hdds.scm.client.HddsClientUtils;
 import org.apache.hadoop.ozone.OzoneConsts;
 
@@ -132,12 +131,7 @@ public static long formatDate(String date) throws ParseException {
     Preconditions.checkNotNull(date, "Date string should not be null.");
     return DATE_FORMAT.get().parse(date).getTime();
   }
-
-  public static boolean isOzoneEnabled(Configuration conf) {
-    return HddsUtils.isHddsEnabled(conf);
-  }
-
-
+
   /**
    * verifies that bucket name / volume name is a valid DNS name.
    *

hadoop-ozone/dev-support/intellij/ozone-site.xml

@@ -23,10 +23,6 @@
     <name>ozone.scm.block.client.address</name>
     <value>localhost</value>
   </property>
-  <property>
-    <name>ozone.enabled</name>
-    <value>True</value>
-  </property>
   <property>
     <name>ozone.scm.datanode.id</name>
     <value>/tmp/datanode.id</value>
@@ -47,10 +43,6 @@
     <name>ozone.om.address</name>
     <value>localhost</value>
   </property>
-  <property>
-    <name>ozone.enabled</name>
-    <value>true</value>
-  </property>
   <property>
     <name>ozone.scm.container.size</name>
     <value>10MB</value>