Repository: incubator-slider Updated Branches: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry f6bbb8b85 -> f67b5507b
SLIDER-415 fix funtests against secure cluster Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/8b32aa17 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/8b32aa17 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/8b32aa17 Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry Commit: 8b32aa17a4d9fb237d0418f47c77bfd5dc529dbf Parents: 4a0b783 Author: Jon Maron <jma...@hortonworks.com> Authored: Wed Sep 10 10:01:10 2014 -0400 Committer: Jon Maron <jma...@hortonworks.com> Committed: Wed Sep 10 10:01:10 2014 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/slider/common/tools/SliderUtils.java | 4 +++- .../slider/funtest/abstracttests/AbstractTestBuildSetup.groovy | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8b32aa17/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java b/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java index 4cdc580..4467849 100644 --- a/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java +++ b/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java @@ -1019,7 +1019,9 @@ public final class SliderUtils { if (authUser.getAuthenticationMethod() == UserGroupInformation.AuthenticationMethod.SIMPLE) { throw new BadConfigException("Auth User is not Kerberized %s" + - " -security has already been set up with the wrong authentication method", + " -security has already been set up with the wrong authentication method. " + + "This can occur if a file system has already been created prior to the loading of " + + "the security configuration.", authUser); } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8b32aa17/slider-funtest/src/main/groovy/org/apache/slider/funtest/abstracttests/AbstractTestBuildSetup.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/main/groovy/org/apache/slider/funtest/abstracttests/AbstractTestBuildSetup.groovy b/slider-funtest/src/main/groovy/org/apache/slider/funtest/abstracttests/AbstractTestBuildSetup.groovy index e0b87f7..104de58 100644 --- a/slider-funtest/src/main/groovy/org/apache/slider/funtest/abstracttests/AbstractTestBuildSetup.groovy +++ b/slider-funtest/src/main/groovy/org/apache/slider/funtest/abstracttests/AbstractTestBuildSetup.groovy @@ -160,6 +160,9 @@ abstract class AbstractTestBuildSetup extends SliderTestUtils implements Funtest @Test public void testSecuritySettingsValid() throws Throwable { Configuration conf = loadSliderConf(); + if (SliderUtils.isHadoopClusterSecure(conf)) { + UserGroupInformation.setLoginUser(null) + } if (SliderUtils.maybeInitSecurity(conf)) { log.info("Security enabled") SliderUtils.forceLogin()
