You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by sm...@apache.org on 2014/10/12 02:58:34 UTC
[46/50] git commit: SLIDER-500;
AM was getting long kerberos username. Move to registry class to
handle this
SLIDER-500; AM was getting long kerberos username. Move to registry class to handle this
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/27bea609
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/27bea609
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/27bea609
Branch: refs/heads/feature/SLIDER-481_allow_dedicated_handling_of_exports
Commit: 27bea6094acfe54cf435e9df376c4e4cefa67391
Parents: a7220ed
Author: Steve Loughran <st...@apache.org>
Authored: Fri Oct 10 17:09:27 2014 -0700
Committer: Steve Loughran <st...@apache.org>
Committed: Fri Oct 10 17:09:27 2014 -0700
----------------------------------------------------------------------
.../org/apache/slider/server/appmaster/SliderAppMaster.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/27bea609/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
index 8725976..4baa11c 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
@@ -29,6 +29,7 @@ import org.apache.hadoop.hdfs.DFSConfigKeys;
import org.apache.hadoop.hdfs.security.token.delegation.DelegationTokenIdentifier;
import org.apache.hadoop.io.DataOutputBuffer;
import org.apache.hadoop.ipc.ProtocolSignature;
+import org.apache.hadoop.registry.client.binding.RegistryUtils;
import org.apache.hadoop.security.Credentials;
import org.apache.hadoop.security.SaslRpcServer;
import org.apache.hadoop.security.UserGroupInformation;
@@ -836,11 +837,10 @@ public class SliderAppMaster extends AbstractSliderLaunchedService
// propagated to workers
if (!UserGroupInformation.isSecurityEnabled()) {
hadoop_user_name = System.getenv(HADOOP_USER_NAME);
- service_user_name = hadoop_user_name;
log.info(HADOOP_USER_NAME + "='{}'", hadoop_user_name);
- } else {
- service_user_name = UserGroupInformation.getCurrentUser().getUserName();
}
+ service_user_name = RegistryUtils.currentUser();
+ log.info("Registry service username ={}", service_user_name);
// now do the registration
registerServiceInstance(clustername, appid);