aboutsummaryrefslogtreecommitdiff
path: root/yarn
diff options
context:
space:
mode:
authorMridul Muralidharan <mridulm80@apache.org>2014-04-24 20:48:33 -0700
committerMatei Zaharia <matei@databricks.com>2014-04-24 20:49:01 -0700
commit51a387a88f23eb6814811e6592a2d54cf1d2cdda (patch)
treedf918c6e75de4f6368d34d2940a95ec3148af3e7 /yarn
parent7b6d774825578774794b508254c142f9248dd5dd (diff)
downloadspark-51a387a88f23eb6814811e6592a2d54cf1d2cdda.tar.gz
spark-51a387a88f23eb6814811e6592a2d54cf1d2cdda.tar.bz2
spark-51a387a88f23eb6814811e6592a2d54cf1d2cdda.zip
SPARK-1586 Windows build fixes
Unfortunately, this is not exhaustive - particularly hive tests still fail due to path issues. Author: Mridul Muralidharan <mridulm80@apache.org> This patch had conflicts when merged, resolved by Committer: Matei Zaharia <matei@databricks.com> Closes #505 from mridulm/windows_fixes and squashes the following commits: ef12283 [Mridul Muralidharan] Move to org.apache.commons.lang3 for StringEscapeUtils. Earlier version was buggy appparently cdae406 [Mridul Muralidharan] Remove leaked changes from > 2G fix branch 3267f4b [Mridul Muralidharan] Fix build failures 35b277a [Mridul Muralidharan] Fix Scalastyle failures bc69d14 [Mridul Muralidharan] Change from hardcoded path separator 10c4d78 [Mridul Muralidharan] Use explicit encoding while using getBytes 1337abd [Mridul Muralidharan] fix classpath while running in windows (cherry picked from commit 968c0187a12f5ae4a696c02c1ff088e998ed7edd) Signed-off-by: Matei Zaharia <matei@databricks.com>
Diffstat (limited to 'yarn')
-rw-r--r--yarn/common/src/main/scala/org/apache/spark/deploy/yarn/YarnSparkHadoopUtil.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/YarnSparkHadoopUtil.scala b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/YarnSparkHadoopUtil.scala
index 832d45b3ad..718cb19f57 100644
--- a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/YarnSparkHadoopUtil.scala
+++ b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/YarnSparkHadoopUtil.scala
@@ -64,7 +64,7 @@ class YarnSparkHadoopUtil extends SparkHadoopUtil {
override def addSecretKeyToUserCredentials(key: String, secret: String) {
val creds = new Credentials()
- creds.addSecretKey(new Text(key), secret.getBytes())
+ creds.addSecretKey(new Text(key), secret.getBytes("utf-8"))
addCurrentUserCredentials(creds)
}