SLIDER-82 disable nodes updated check in TestRESTStandalone; allows for feature branch to be resynced into develop/
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/002a88a0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/002a88a0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/002a88a0 Branch: refs/heads/feature/SLIDER-82-anti-affinity-attempt-2 Commit: 002a88a05a469ac547c79095a81991a47661ac89 Parents: 65617d5 Author: Steve Loughran <ste...@apache.org> Authored: Sun Nov 1 11:47:09 2015 +0000 Committer: Steve Loughran <ste...@apache.org> Committed: Sun Nov 1 11:47:09 2015 +0000 ---------------------------------------------------------------------- .../slider/server/appmaster/state/RoleHistory.java | 1 - .../apache/slider/agent/rest/JerseyTestDelegates.groovy | 11 ++--------- .../apache/slider/agent/rest/TestStandaloneREST.groovy | 5 +++-- 3 files changed, 5 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/002a88a0/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleHistory.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleHistory.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleHistory.java index c22d517..df3983a 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleHistory.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleHistory.java @@ -964,7 +964,6 @@ public class RoleHistory { return outstandingRequests.listPlacedRequests(); } - /** * Get a snapshot of the outstanding placed request list * @return a list of the requests outstanding at the time of requesting http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/002a88a0/slider-core/src/test/groovy/org/apache/slider/agent/rest/JerseyTestDelegates.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/rest/JerseyTestDelegates.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/rest/JerseyTestDelegates.groovy index 857d15c..ff01dc5 100644 --- a/slider-core/src/test/groovy/org/apache/slider/agent/rest/JerseyTestDelegates.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/agent/rest/JerseyTestDelegates.groovy @@ -177,7 +177,6 @@ class JerseyTestDelegates extends AbstractRestTestDelegate { public void testCodahaleOperations() throws Throwable { describe "Codahale operations" - jerseyGet("/") jerseyGet(SYSTEM_THREADS) jerseyGet(SYSTEM_HEALTHCHECK) @@ -288,14 +287,9 @@ class JerseyTestDelegates extends AbstractRestTestDelegate { // two components assert components.size() >= 1 log.info "${components}" - - ComponentInformation amComponentInfo = - (ComponentInformation) components[COMPONENT_AM] - ComponentInformation amFullInfo = jFetchType( LIVE_COMPONENTS + "/${COMPONENT_AM}", - ComponentInformation - ) + ComponentInformation) assert amFullInfo.containers.size() == 1 assert amFullInfo.containers[0] == amContainerId @@ -352,8 +346,7 @@ class JerseyTestDelegates extends AbstractRestTestDelegate { def unresolvedAppConf = unresolvedConf.appConfOperations def sam = "slider-appmaster" - assert unresolvedAppConf.getComponentOpt(sam, - TEST_GLOBAL_OPTION, "") == "" + assert unresolvedAppConf.getComponentOpt(sam, TEST_GLOBAL_OPTION, "") == "" def resolvedConf = jFetchType(MODEL_RESOLVED, AggregateConf) // log.info "Resolved \n$resolvedConf" assert resolvedConf.appConfOperations.getComponentOpt( http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/002a88a0/slider-core/src/test/groovy/org/apache/slider/agent/rest/TestStandaloneREST.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/rest/TestStandaloneREST.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/rest/TestStandaloneREST.groovy index 9808688..97b3009 100644 --- a/slider-core/src/test/groovy/org/apache/slider/agent/rest/TestStandaloneREST.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/agent/rest/TestStandaloneREST.groovy @@ -87,11 +87,13 @@ class TestStandaloneREST extends AgentMiniClusterTestBase { log.info GET(proxyAM, SYSTEM_METRICS_JSON) // using the metrics, await the first node status update + /* SLIDER--82: disabled awaitGaugeValue( appendToURL(proxyAM, SYSTEM_METRICS_JSON), "org.apache.slider.server.appmaster.state.RoleHistory.nodes-updated.flag", 1, WEB_STARTUP_TIME * 2, 500) + */ // Is the back door required? If so, don't test complex verbs via the proxy def proxyComplexVerbs = !SliderXmlConfKeys.X_DEV_INSECURE_REQUIRED @@ -103,8 +105,7 @@ class TestStandaloneREST extends AgentMiniClusterTestBase { SliderXmlConfKeys.X_DEV_INSECURE_DEFAULT) describe "Direct response headers from AM Web resources" - def liveResUrl = appendToURL(directAM, - SLIDER_PATH_APPLICATION, LIVE_RESOURCES); + def liveResUrl = appendToURL(directAM, SLIDER_PATH_APPLICATION, LIVE_RESOURCES); HttpOperationResponse response = executeGet(liveResUrl) response.headers.each { key, val -> log.info("$key $val") } log.info "Content type: ${response.contentType}"