Merge branch 'feature/SLIDER-319_codahale_metrics' 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/a3b6fa5b Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/a3b6fa5b Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/a3b6fa5b Branch: refs/heads/develop Commit: a3b6fa5b0aeaddf401dbba49529d763ec4d8278c Parents: f0a30fd a2966af Author: Steve Loughran <[email protected]> Authored: Tue Nov 25 19:21:45 2014 +0000 Committer: Steve Loughran <[email protected]> Committed: Tue Nov 25 19:21:45 2014 +0000 ---------------------------------------------------------------------- pom.xml | 30 ++++- slider-core/pom.xml | 21 ++- .../launch/SerializedApplicationReport.java | 2 + .../core/registry/retrieve/AMWebClient.java | 129 +++++++++++++++++++ .../registry/retrieve/RegistryRetriever.java | 87 +------------ .../server/appmaster/SliderAppMaster.java | 54 +++++--- .../management/MetricsAndMonitoring.java | 62 +++++++++ .../management/MetricsBindingService.java | 128 ++++++++++++++++++ .../management/YarnServiceHealthCheck.java | 38 ++++++ .../server/appmaster/monkey/ChaosEntry.java | 2 - .../slider/server/appmaster/state/AppState.java | 11 +- .../server/appmaster/web/SliderAMWebApp.java | 26 +++- .../slider/server/appmaster/web/WebAppApi.java | 15 ++- .../server/appmaster/web/WebAppApiImpl.java | 25 ++-- .../server/appmaster/web/rest/RestPaths.java | 5 + .../appmaster/web/rest/agent/AgentWebApp.java | 1 - .../server/appmaster/web/view/NavBlock.java | 12 +- .../standalone/TestStandaloneAgentAM.groovy | 14 +- .../standalone/TestStandaloneAgentWeb.groovy | 81 ++++++++++++ .../appmaster/model/mock/MockAppState.groovy | 5 +- .../model/monkey/TestMockMonkey.groovy | 2 +- .../view/TestClusterSpecificationBlock.groovy | 2 +- .../web/view/TestContainerStatsBlock.groovy | 2 +- .../appmaster/web/view/TestIndexBlock.groovy | 2 +- .../apache/slider/test/SliderTestBase.groovy | 3 +- .../web/rest/agent/TestAMAgentWebServices.java | 5 +- .../management/TestAMManagementWebServices.java | 5 +- .../funtest/framework/CommandTestBase.groovy | 51 ++++++++ .../funtest/lifecycle/AgentWebPagesIT.groovy | 92 +++++++++++++ .../lifecycle/AppsThroughAgentDemo.groovy | 2 +- 30 files changed, 758 insertions(+), 156 deletions(-) ----------------------------------------------------------------------
