Repository: spark
Updated Branches:
refs/heads/branch-1.3 1c59a4bd3 -> f8132ded0
[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 <tgra...@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
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/f8132ded
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/f8132ded
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/f8132ded
Branch: refs/heads/branch-1.3
Commit: f8132ded0c89f682e13cb12ecd8aee32b417437e
Parents: 1c59a4b
Author: Thomas Graves <tgra...@apache.org>
Authored: Sun Mar 29 12:43:30 2015 +0100
Committer: Sean Owen <so...@cloudera.com>
Committed: Mon Mar 30 13:58:33 2015 +0100
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/util/Utils.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/f8132ded/core/src/main/scala/org/apache/spark/util/Utils.scala
----------------------------------------------------------------------
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 949bc55..c136584 100644
--- a/core/src/main/scala/org/apache/spark/util/Utils.scala
+++ b/core/src/main/scala/org/apache/spark/util/Utils.scala
@@ -1998,7 +1998,7 @@ private[spark] object Utils extends Logging {
*/
def getCurrentUserName(): String = {
Option(System.getenv("SPARK_USER"))
- .getOrElse(UserGroupInformation.getCurrentUser().getUserName())
+ .getOrElse(UserGroupInformation.getCurrentUser().getShortUserName())
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
