spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sro...@apache.org
Subject spark git commit: [SPARK-12166][TEST] Unset hadoop related environment in testing
Date Tue, 08 Dec 2015 11:05:19 GMT
Repository: spark
Updated Branches:
  refs/heads/branch-1.6 c9e5274ae -> 870f43562


[SPARK-12166][TEST] Unset hadoop related environment in testing

Author: Jeff Zhang <zjffdu@apache.org>

Closes #10172 from zjffdu/SPARK-12166.

(cherry picked from commit 708129187a460aca30790281e9221c0cd5e271df)
Signed-off-by: Sean Owen <sowen@cloudera.com>


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

Branch: refs/heads/branch-1.6
Commit: 870f435628b7c0eac5f6c45fa19b14ab5289c657
Parents: c9e5274
Author: Jeff Zhang <zjffdu@apache.org>
Authored: Tue Dec 8 11:05:06 2015 +0000
Committer: Sean Owen <sowen@cloudera.com>
Committed: Tue Dec 8 11:05:16 2015 +0000

----------------------------------------------------------------------
 bin/spark-class | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/870f4356/bin/spark-class
----------------------------------------------------------------------
diff --git a/bin/spark-class b/bin/spark-class
index 87d0669..5d964ba 100755
--- a/bin/spark-class
+++ b/bin/spark-class
@@ -71,6 +71,12 @@ fi
 
 export _SPARK_ASSEMBLY="$SPARK_ASSEMBLY_JAR"
 
+# For tests
+if [[ -n "$SPARK_TESTING" ]]; then
+  unset YARN_CONF_DIR
+  unset HADOOP_CONF_DIR
+fi
+
 # The launcher library will print arguments separated by a NULL character, to allow arguments
with
 # characters that would be otherwise interpreted by the shell. Read that in a while loop,
populating
 # an array that will be used to exec the final command.


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


Mime
View raw message