Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: aengineer@apache.org
To: common-commits@hadoop.apache.org
Message-Id: <cfd82dd76d324a58bcba098e094fde3f@git.apache.org>
Subject: hadoop git commit: Ozone: Fix Ozone's env vars (again). Contributed
 by Allen Wittenauer.
Date: Mon, 30 Oct 2017 20:37:39 +0000 (UTC)
archived-at: Mon, 30 Oct 2017 20:37:41 -0000

Repository: hadoop
Updated Branches:
  refs/heads/HDFS-7240 d11161bb6 -> c4b056cb4


Ozone: Fix Ozone's env vars (again). Contributed by Allen Wittenauer.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c4b056cb
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c4b056cb
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c4b056cb

Branch: refs/heads/HDFS-7240
Commit: c4b056cb4e1507e93d3d6465594fdb654aeaef66
Parents: d11161b
Author: Anu Engineer <aengineer@apache.org>
Authored: Mon Oct 30 13:31:22 2017 -0700
Committer: Anu Engineer <aengineer@apache.org>
Committed: Mon Oct 30 13:31:22 2017 -0700

----------------------------------------------------------------------
 .../hadoop-common/src/main/conf/hadoop-env.sh           |  2 +-
 hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs       | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/c4b056cb/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh b/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh
index 1c5a19c..7dcf5e6 100644
--- a/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh
+++ b/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh
@@ -420,7 +420,7 @@ esac
 # These options will be appended to the options specified as HADOOP_OPTS
 # and therefore may override any similar flags set in HADOOP_OPTS
 #
-# export HDFS_KEYSPACEMANAGER_OPTS=""
+# export HDFS_KSM_OPTS=""
 
 ###
 # HDFS StorageContainerManager specific parameters

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c4b056cb/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs
index 3df795e..021398c 100755
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs
@@ -35,7 +35,7 @@ function hadoop_usage
   hadoop_add_subcommand "balancer" daemon "run a cluster balancing utility"
   hadoop_add_subcommand "cacheadmin" admin "configure the HDFS cache"
   hadoop_add_subcommand "cblock" admin "cblock CLI"
-   hadoop_add_subcommand "cblockserver" daemon "run cblock server"
+  hadoop_add_subcommand "cblockserver" daemon "run cblock server"
   hadoop_add_subcommand "classpath" client "prints the class path needed to get the hadoop jar and the required libraries"
   hadoop_add_subcommand "corona" client "run an ozone data generator"
   hadoop_add_subcommand "crypto" admin "configure HDFS encryption zones"
@@ -101,8 +101,6 @@ function hdfscmd_case
     cblockserver)
       HADOOP_SUBCMD_SUPPORTDAEMONIZATION="true"
       HADOOP_CLASSNAME=org.apache.hadoop.cblock.CBlockManager
-      hadoop_debug "Appending HDFS_CBLOCKSERVER_OPTS onto HADOOP_OPTS"
-      HADOOP_OPTS="${HADOOP_OPTS} ${HDFS_CBLOCKSERVER_OPTS}"
     ;;
     classpath)
       hadoop_do_classpath_subcommand HADOOP_CLASSNAME "$@"
@@ -175,8 +173,6 @@ function hdfscmd_case
     jscsi)
       HADOOP_SUBCMD_SUPPORTDAEMONIZATION="true"
       HADOOP_CLASSNAME=org.apache.hadoop.cblock.jscsiHelper.SCSITargetDaemon
-      hadoop_debug "Appending HDFS_JSCSI_OPTS onto HADOOP_OPTS"
-      HADOOP_OPTS="${HADOOP_OPTS} ${HDFS_JSCSI_OPTS}"
     ;;
     jmxget)
       HADOOP_CLASSNAME=org.apache.hadoop.hdfs.tools.JMXGet
@@ -184,8 +180,6 @@ function hdfscmd_case
     ksm)
       HADOOP_SUBCMD_SUPPORTDAEMONIZATION="true"
       HADOOP_CLASSNAME=org.apache.hadoop.ozone.ksm.KeySpaceManager
-      hadoop_debug "Appending HDFS_KEYSPACEMANAGER_OPTS onto HADOOP_OPTS"
-      HADOOP_OPTS="${HADOOP_OPTS} ${HDFS_KEYSPACEMANAGER_OPTS}"
     ;;
     lsSnapshottableDir)
       HADOOP_CLASSNAME=org.apache.hadoop.hdfs.tools.snapshot.LsSnapshottableDir
@@ -231,10 +225,8 @@ function hdfscmd_case
       else
         HADOOP_SUBCMD_SUPPORTDAEMONIZATION="true"
         HADOOP_CLASSNAME='org.apache.hadoop.ozone.scm.StorageContainerManager'
-        hadoop_debug "Appending HDFS_STORAGECONTAINERMANAGER_OPTS onto HADOOP_OPTS"
-        HADOOP_OPTS="${HADOOP_OPTS} ${HDFS_STORAGECONTAINERMANAGER_OPTS}"
       fi
-    ;;    
+    ;;
     secondarynamenode)
       HADOOP_SUBCMD_SUPPORTDAEMONIZATION="true"
       HADOOP_CLASSNAME='org.apache.hadoop.hdfs.server.namenode.SecondaryNameNode'


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org