Repository: incubator-slider Updated Branches: refs/heads/develop 0be636780 -> de0e1f259
SLIDER-1220 Fix funtest failures when sasl security is configured for registry Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/de0e1f25 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/de0e1f25 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/de0e1f25 Branch: refs/heads/develop Commit: de0e1f2597c07c2d70b70306bc22e2b4503e4b1e Parents: 0be6367 Author: Billie Rinaldi <bil...@apache.org> Authored: Tue Mar 21 11:07:06 2017 -0700 Committer: Billie Rinaldi <bil...@apache.org> Committed: Tue Mar 21 11:07:06 2017 -0700 ---------------------------------------------------------------------- .../funtest/framework/CommandTestBase.groovy | 41 ++++++++------------ .../funtest/lifecycle/AppsUpgradeIT.groovy | 21 +++++----- .../funtest/misc/AMConfigPublishingIT.groovy | 8 +--- .../funtest/misc/ExternalComponentIT.groovy | 18 ++++----- 4 files changed, 39 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/de0e1f25/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy index f6bdd19..0eb7541 100644 --- a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy +++ b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy @@ -634,6 +634,21 @@ abstract class CommandTestBase extends SliderTestUtils { clusterOps) } + public void maybeAddSecurityOptions(List<String> commands) { + maybeAddCommandOption(commands, + [ARG_COMP_OPT, SliderKeys.COMPONENT_AM, SliderXmlConfKeys.KEY_AM_LOGIN_KEYTAB_NAME], + SLIDER_CONFIG.getTrimmed(SliderXmlConfKeys.KEY_AM_LOGIN_KEYTAB_NAME)); + maybeAddCommandOption(commands, + [ARG_COMP_OPT, SliderKeys.COMPONENT_AM, SliderXmlConfKeys.KEY_HDFS_KEYTAB_DIR], + SLIDER_CONFIG.getTrimmed(SliderXmlConfKeys.KEY_HDFS_KEYTAB_DIR)); + maybeAddCommandOption(commands, + [ARG_COMP_OPT, SliderKeys.COMPONENT_AM, SliderXmlConfKeys.KEY_AM_KEYTAB_LOCAL_PATH], + SLIDER_CONFIG.getTrimmed(SliderXmlConfKeys.KEY_AM_KEYTAB_LOCAL_PATH)); + maybeAddCommandOption(commands, + [ARG_COMP_OPT, SliderKeys.COMPONENT_AM, SliderXmlConfKeys.KEY_KEYTAB_PRINCIPAL], + SLIDER_CONFIG.getTrimmed(SliderXmlConfKeys.KEY_KEYTAB_PRINCIPAL)); + } + /** * Create a slider app using the alternate packaging capability * <p> @@ -677,18 +692,7 @@ abstract class CommandTestBase extends SliderTestUtils { commands << ARG_WAIT << Integer.toString(THAW_WAIT_TIME) } - maybeAddCommandOption(commands, - [ARG_COMP_OPT, SliderKeys.COMPONENT_AM, SliderXmlConfKeys.KEY_AM_LOGIN_KEYTAB_NAME], - SLIDER_CONFIG.getTrimmed(SliderXmlConfKeys.KEY_AM_LOGIN_KEYTAB_NAME)); - maybeAddCommandOption(commands, - [ARG_COMP_OPT, SliderKeys.COMPONENT_AM, SliderXmlConfKeys.KEY_HDFS_KEYTAB_DIR], - SLIDER_CONFIG.getTrimmed(SliderXmlConfKeys.KEY_HDFS_KEYTAB_DIR)); - maybeAddCommandOption(commands, - [ARG_COMP_OPT, SliderKeys.COMPONENT_AM, SliderXmlConfKeys.KEY_AM_KEYTAB_LOCAL_PATH], - SLIDER_CONFIG.getTrimmed(SliderXmlConfKeys.KEY_AM_KEYTAB_LOCAL_PATH)); - maybeAddCommandOption(commands, - [ARG_COMP_OPT, SliderKeys.COMPONENT_AM, SliderXmlConfKeys.KEY_KEYTAB_PRINCIPAL], - SLIDER_CONFIG.getTrimmed(SliderXmlConfKeys.KEY_KEYTAB_PRINCIPAL)); + maybeAddSecurityOptions(commands) commands.addAll(extraArgs) SliderShell shell = new SliderShell(commands) if (0 != shell.execute()) { @@ -750,18 +754,7 @@ abstract class CommandTestBase extends SliderTestUtils { commands << ARG_WAIT << Integer.toString(THAW_WAIT_TIME) } - maybeAddCommandOption(commands, - [ARG_COMP_OPT, SliderKeys.COMPONENT_AM, SliderXmlConfKeys.KEY_AM_LOGIN_KEYTAB_NAME], - SLIDER_CONFIG.getTrimmed(SliderXmlConfKeys.KEY_AM_LOGIN_KEYTAB_NAME)); - maybeAddCommandOption(commands, - [ARG_COMP_OPT, SliderKeys.COMPONENT_AM, SliderXmlConfKeys.KEY_HDFS_KEYTAB_DIR], - SLIDER_CONFIG.getTrimmed(SliderXmlConfKeys.KEY_HDFS_KEYTAB_DIR)); - maybeAddCommandOption(commands, - [ARG_COMP_OPT, SliderKeys.COMPONENT_AM, SliderXmlConfKeys.KEY_AM_KEYTAB_LOCAL_PATH], - SLIDER_CONFIG.getTrimmed(SliderXmlConfKeys.KEY_AM_KEYTAB_LOCAL_PATH)); - maybeAddCommandOption(commands, - [ARG_COMP_OPT, SliderKeys.COMPONENT_AM, SliderXmlConfKeys.KEY_KEYTAB_PRINCIPAL], - SLIDER_CONFIG.getTrimmed(SliderXmlConfKeys.KEY_KEYTAB_PRINCIPAL)); + maybeAddSecurityOptions(commands) commands << ARG_COMP_OPT << SliderKeys.COMPONENT_AM << "env." + Constants.HADOOP_JAAS_DEBUG << "true"; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/de0e1f25/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsUpgradeIT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsUpgradeIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsUpgradeIT.groovy index fa8b7a5..e18a757 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsUpgradeIT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsUpgradeIT.groovy @@ -104,16 +104,17 @@ public class AppsUpgradeIT extends AgentCommandTestBase APP_RESOURCE ]) describe("Call upgrade spec - spec mismatch with current state, use --force") - slider(EXIT_SUCCESS, - [ - ACTION_UPGRADE, - APPLICATION_NAME, - ARG_TEMPLATE, - APP_TEMPLATE, - ARG_RESOURCES, - APP_RESOURCE, - ARG_FORCE - ]) + def commands = [ + ACTION_UPGRADE, + APPLICATION_NAME, + ARG_TEMPLATE, + APP_TEMPLATE, + ARG_RESOURCES, + APP_RESOURCE, + ARG_FORCE + ] + maybeAddSecurityOptions(commands) + slider(EXIT_SUCCESS, commands) // This is a very time constrained check, so disabling it. Catching the // app not in RUNNING state after AM restart, is like racing with RM. http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/de0e1f25/slider-funtest/src/test/groovy/org/apache/slider/funtest/misc/AMConfigPublishingIT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/misc/AMConfigPublishingIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/misc/AMConfigPublishingIT.groovy index e84ada6..df35211 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/misc/AMConfigPublishingIT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/misc/AMConfigPublishingIT.groovy @@ -114,12 +114,8 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions { def path = buildClusterPath(APP_NAME) assert !clusterFS.exists(path) - slider(EXIT_SUCCESS, - [ - ACTION_CREATE, APP_NAME, - ARG_TEMPLATE, APP_TEMPLATE, ARG_RESOURCES, APP_RESOURCE, - ARG_METAINFO, APP_METAINFO - ]) + createSliderApplicationMinPkg(APP_NAME, APP_METAINFO, APP_RESOURCE, + APP_TEMPLATE) ensureApplicationIsUp(APP_NAME) expectLiveContainerCountReached(APP_NAME, DATE_LOGGER, 1, http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/de0e1f25/slider-funtest/src/test/groovy/org/apache/slider/funtest/misc/ExternalComponentIT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/misc/ExternalComponentIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/misc/ExternalComponentIT.groovy index 292508a..59bfe48 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/misc/ExternalComponentIT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/misc/ExternalComponentIT.groovy @@ -85,8 +85,8 @@ public class ExternalComponentIT extends AgentCommandTestBase ARG_RES_COMP_OPT, SLEEP_LONG, ResourceKeys.COMPONENT_INSTANCES, "1" ]) - slider(0, [ACTION_CREATE, NAME, ARG_METAINFO, TEST_METAINFO, - ARG_TEMPLATE, TEST_APPCONFIG, ARG_RESOURCES, TEST_RESOURCES]) + createSliderApplicationMinPkg(NAME, TEST_METAINFO, TEST_RESOURCES, + TEST_APPCONFIG) ensureApplicationIsUp(NAME) status(0, NAME) @@ -112,11 +112,11 @@ public class ExternalComponentIT extends AgentCommandTestBase // test overriding the number of instances of external components describe NAME + "-2" - slider(0, [ACTION_CREATE, NAME, ARG_METAINFO, TEST_METAINFO, - ARG_TEMPLATE, TEST_APPCONFIG, ARG_RESOURCES, TEST_RESOURCES, - ARG_RES_COMP_OPT, SLEEP_LONG, ResourceKeys.COMPONENT_INSTANCES, "0", - ARG_RES_COMP_OPT, EXT_SLEEP_LONG, ResourceKeys.COMPONENT_INSTANCES, "2", - ]) + createSliderApplicationMinPkg(NAME, TEST_METAINFO, TEST_RESOURCES, + TEST_APPCONFIG, + [ARG_RES_COMP_OPT, SLEEP_LONG, ResourceKeys.COMPONENT_INSTANCES, "0", + ARG_RES_COMP_OPT, EXT_SLEEP_LONG, ResourceKeys.COMPONENT_INSTANCES, "2" + ]) ensureApplicationIsUp(NAME) status(0, NAME) @@ -144,8 +144,8 @@ public class ExternalComponentIT extends AgentCommandTestBase slider(0, [ACTION_BUILD, NAME, ARG_METAINFO, TEST_METAINFO, ARG_TEMPLATE, TEST_APPCONFIG, ARG_RESOURCES, TEST_RESOURCES]) - slider(0, [ACTION_CREATE, NESTED_NAME, ARG_METAINFO, NEST_METAINFO, - ARG_TEMPLATE, NEST_APPCONFIG, ARG_RESOURCES, NEST_RESOURCES]) + createSliderApplicationMinPkg(NESTED_NAME, NEST_METAINFO, NEST_RESOURCES, + NEST_APPCONFIG) ensureApplicationIsUp(NESTED_NAME) status(0, NESTED_NAME)