SLIDER-1035: remove (pointless )--fail option, IT test to use keylen 128.
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/e1548568 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e1548568 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e1548568 Branch: refs/heads/develop Commit: e1548568ddbfbb5da7230bef7b6b58ae7baad4dc Parents: d619bab Author: Steve Loughran <ste...@apache.org> Authored: Sun Jan 17 19:45:00 2016 -0800 Committer: Steve Loughran <ste...@apache.org> Committed: Sun Jan 17 19:45:00 2016 -0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/slider/client/SliderClient.java | 8 ++------ .../org/apache/slider/common/params/ActionKDiagArgs.java | 4 ---- .../groovy/org/apache/slider/client/TestDiagnostics.groovy | 1 - .../org/apache/slider/funtest/commands/KDiagCommandIT.groovy | 2 +- 4 files changed, 3 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e1548568/slider-core/src/main/java/org/apache/slider/client/SliderClient.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java index 7e644d2..aa19a3b 100644 --- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java +++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java @@ -3802,14 +3802,10 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe } catch (KerberosDiags.KerberosDiagsFailure e) { log.error(e.toString()); log.debug(e.toString(), e); - if (args.fail) { - throw e; - } + throw e; } catch (Exception e) { log.error("Kerberos Diagnostics", e); - if (args.fail) { - throw e; - } + throw e; } finally { if (closeStream) { out.flush(); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e1548568/slider-core/src/main/java/org/apache/slider/common/params/ActionKDiagArgs.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/ActionKDiagArgs.java b/slider-core/src/main/java/org/apache/slider/common/params/ActionKDiagArgs.java index 5332c4b..9fc9d2e 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/ActionKDiagArgs.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/ActionKDiagArgs.java @@ -38,10 +38,6 @@ public class ActionKDiagArgs extends AbstractActionArgs { return SliderActions.ACTION_KDIAG; } - @Parameter(names = {ARG_FAIL}, - description = "return an exit code if the diagnostics failed") - public boolean fail = true; - @Parameter(names = {ARG_SERVICES}, variableArity = true, description =" list of services to check") public List<String> services = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e1548568/slider-core/src/test/groovy/org/apache/slider/client/TestDiagnostics.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/client/TestDiagnostics.groovy b/slider-core/src/test/groovy/org/apache/slider/client/TestDiagnostics.groovy index 3e4e913..a20ab23 100644 --- a/slider-core/src/test/groovy/org/apache/slider/client/TestDiagnostics.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/client/TestDiagnostics.groovy @@ -65,7 +65,6 @@ class TestDiagnostics extends YarnZKMiniClusterTestBase { SliderUtils.createConfiguration(), [ ClientArgs.ACTION_KDIAG, - ClientArgs.ARG_FAIL, ClientArgs.ARG_KEYLEN, "128", ClientArgs.ARG_SYSPROP, define(SUN_SECURITY_KRB5_DEBUG, "true")]) http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e1548568/slider-funtest/src/test/groovy/org/apache/slider/funtest/commands/KDiagCommandIT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/commands/KDiagCommandIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/commands/KDiagCommandIT.groovy index 61325e2..ebdd00c 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/commands/KDiagCommandIT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/commands/KDiagCommandIT.groovy @@ -35,7 +35,7 @@ public class KDiagCommandIT extends CommandTestBase implements Arguments { public void testKdiag() throws Throwable { SliderShell shell = new SliderShell([ SliderActions.ACTION_KDIAG, - ARG_FAIL + ARG_KEYLEN, "128" ], [(ENV_JAAS_DEBUG): "true"] )
