hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jzh...@apache.org
Subject hadoop git commit: HDFS-12166. Do not deprecate HTTPFS_TEMP. Contributed by John Zhuge.
Date Fri, 21 Jul 2017 03:57:20 GMT
Repository: hadoop
Updated Branches:
  refs/heads/trunk 44350fdf4 -> 3b48f8141


HDFS-12166. Do not deprecate HTTPFS_TEMP. Contributed by John Zhuge.

Change-Id: Icdd032de9feea3d0dde71bf8145b70497993d97f


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

Branch: refs/heads/trunk
Commit: 3b48f81411230d1cfa7b0f6ad82f44cb0dc0efa6
Parents: 44350fd
Author: John Zhuge <jzhuge@cloudera.com>
Authored: Wed Jul 19 17:37:33 2017 -0700
Committer: John Zhuge <jzhuge@apache.org>
Committed: Thu Jul 20 20:45:09 2017 -0700

----------------------------------------------------------------------
 .../hadoop-hdfs-httpfs/src/main/conf/httpfs-env.sh  |  2 +-
 .../fs/http/server/HttpFSServerWebServer.java       |  2 --
 .../main/libexec/shellprofile.d/hadoop-httpfs.sh    | 16 ++++++++++------
 .../src/site/markdown/ServerSetup.md.vm             |  1 -
 4 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/3b48f814/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/conf/httpfs-env.sh
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/conf/httpfs-env.sh b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/conf/httpfs-env.sh
index 6c0a80f..5b7b05d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/conf/httpfs-env.sh
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/conf/httpfs-env.sh
@@ -28,7 +28,7 @@
 
 # HTTPFS temporary directory
 #
-# export HTTPFS_TEMP=${HADOOP_HOME}/temp
+# export HTTPFS_TEMP=${HADOOP_HDFS_HOME}/temp
 
 # The HTTP port used by HTTPFS
 #

http://git-wip-us.apache.org/repos/asf/hadoop/blob/3b48f814/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebServer.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebServer.java
b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebServer.java
index 0949f86..39f1caf 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebServer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebServer.java
@@ -71,8 +71,6 @@ public class HttpFSServerWebServer {
   HttpFSServerWebServer(Configuration conf, Configuration sslConf) throws
       Exception {
     // Override configuration with deprecated environment variables.
-    deprecateEnv("HTTPFS_TEMP", conf, HttpServer2.HTTP_TEMP_DIR_KEY,
-        HTTPFS_SITE_XML);
     deprecateEnv("HTTPFS_HTTP_HOSTNAME", conf, HTTP_HOSTNAME_KEY,
         HTTPFS_SITE_XML);
     deprecateEnv("HTTPFS_HTTP_PORT", conf, HTTP_PORT_KEY,

http://git-wip-us.apache.org/repos/asf/hadoop/blob/3b48f814/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/shellprofile.d/hadoop-httpfs.sh
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/shellprofile.d/hadoop-httpfs.sh
b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/shellprofile.d/hadoop-httpfs.sh
old mode 100644
new mode 100755
index 239409c..6301e27
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/shellprofile.d/hadoop-httpfs.sh
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/shellprofile.d/hadoop-httpfs.sh
@@ -37,14 +37,18 @@ function hdfs_subcommand_httpfs
   # shellcheck disable=SC2034
 
   hadoop_add_param HADOOP_OPTS "-Dhttpfs.home.dir" \
-    "-Dhttpfs.home.dir=${HADOOP_HOME}"
+    "-Dhttpfs.home.dir=${HTTPFS_HOME:-${HADOOP_HDFS_HOME}}"
   hadoop_add_param HADOOP_OPTS "-Dhttpfs.config.dir" \
     "-Dhttpfs.config.dir=${HTTPFS_CONFIG:-${HADOOP_CONF_DIR}}"
   hadoop_add_param HADOOP_OPTS "-Dhttpfs.log.dir" \
     "-Dhttpfs.log.dir=${HTTPFS_LOG:-${HADOOP_LOG_DIR}}"
 
-  if [[ "${HADOOP_DAEMON_MODE}" == "default" ]] ||
-     [[ "${HADOOP_DAEMON_MODE}" == "start" ]]; then
-    hadoop_mkdir "${HTTPFS_TEMP:-${HADOOP_HOME}/temp}"
-  fi
-}
\ No newline at end of file
+  local temp_dir=${HTTPFS_TEMP:-${HADOOP_HDFS_HOME}/temp}
+  hadoop_add_param HADOOP_OPTS "-Dhttpfs.temp.dir" \
+    "-Dhttpfs.temp.dir=${temp_dir}"
+  case ${HADOOP_DAEMON_MODE} in
+    start|default)
+      hadoop_mkdir "${temp_dir}"
+    ;;
+  esac
+}

http://git-wip-us.apache.org/repos/asf/hadoop/blob/3b48f814/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm
index 91ef90e..072c067 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm
@@ -149,7 +149,6 @@ HTTPFS_MAX_THREADS          | hadoop.http.max.threads      | httpfs-site.xml
 HTTPFS_SSL_ENABLED          | httpfs.ssl.enabled           | httpfs-site.xml
 HTTPFS_SSL_KEYSTORE_FILE    | ssl.server.keystore.location | ssl-server.xml
 HTTPFS_SSL_KEYSTORE_PASS    | ssl.server.keystore.password | ssl-server.xml
-HTTPFS_TEMP                 | hadoop.http.temp.dir         | httpfs-site.xml
 
 HTTP Default Services
 ---------------------


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


Mime
View raw message