aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorThomas Graves <tgraves@apache.org>2015-03-29 12:43:30 +0100
committerSean Owen <sowen@cloudera.com>2015-03-29 12:43:30 +0100
commit52ece26b8fb9769f6ed9167e3dffc8b1d7c61b02 (patch)
tree6c1f69ebab4da64291ccc4f2fc9f27a60ebf3cb0 /core
parente3eb393961051a48ed1cac756ac1928156aa161f (diff)
downloadspark-52ece26b8fb9769f6ed9167e3dffc8b1d7c61b02.tar.gz
spark-52ece26b8fb9769f6ed9167e3dffc8b1d7c61b02.tar.bz2
spark-52ece26b8fb9769f6ed9167e3dffc8b1d7c61b02.zip
[SPARK-6558] Utils.getCurrentUserName returns the full principal name instead of login name
Utils.getCurrentUserName returns UserGroupInformation.getCurrentUser().getUserName() when SPARK_USER isn't set. It should return UserGroupInformation.getCurrentUser().getShortUserName() getUserName() returns the users full principal name (ie user1CORP.COM). getShortUserName() returns just the users login name (user1). This just happens to work on YARN because the Client code sets: env("SPARK_USER") = UserGroupInformation.getCurrentUser().getShortUserName() Author: Thomas Graves <tgraves@apache.org> Closes #5229 from tgravescs/SPARK-6558 and squashes the following commits: 24830bf [Thomas Graves] Utils.getCurrentUserName returns the full principal name instead of login name
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/org/apache/spark/util/Utils.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/util/Utils.scala b/core/src/main/scala/org/apache/spark/util/Utils.scala
index 0b5a914e7d..bb8bd10156 100644
--- a/core/src/main/scala/org/apache/spark/util/Utils.scala
+++ b/core/src/main/scala/org/apache/spark/util/Utils.scala
@@ -2055,7 +2055,7 @@ private[spark] object Utils extends Logging {
*/
def getCurrentUserName(): String = {
Option(System.getenv("SPARK_USER"))
- .getOrElse(UserGroupInformation.getCurrentUser().getUserName())
+ .getOrElse(UserGroupInformation.getCurrentUser().getShortUserName())
}
}