You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2015/11/23 18:21:02 UTC
[50/50] incubator-slider git commit: Merge branch
'feature/SLIDER-82-pass-3.1' into develop
Merge branch 'feature/SLIDER-82-pass-3.1' 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/cf00b9a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/cf00b9a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/cf00b9a5
Branch: refs/heads/develop
Commit: cf00b9a5d8b277d8b0e2dfa1b0e45075900cebf0
Parents: 1a3fb79 90f1bba
Author: Steve Loughran <st...@apache.org>
Authored: Mon Nov 23 17:20:18 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Nov 23 17:20:18 2015 +0000
----------------------------------------------------------------------
slider-assembly/src/conf/slider-client.xml | 45 +-
.../apache/slider/api/ClusterDescription.java | 47 +-
.../api/ClusterDescriptionOperations.java | 3 +-
.../java/org/apache/slider/api/ClusterNode.java | 9 +-
.../java/org/apache/slider/api/RoleKeys.java | 20 +-
.../apache/slider/api/SliderApplicationApi.java | 19 +-
.../org/apache/slider/api/proto/Messages.java | 647 +++++++++-------
.../slider/api/proto/RestTypeMarshalling.java | 46 +-
.../types/ApplicationLivenessInformation.java | 6 +
.../slider/api/types/ComponentInformation.java | 7 +-
.../slider/api/types/NodeEntryInformation.java | 19 +-
.../slider/api/types/NodeInformation.java | 27 +-
.../slider/api/types/NodeInformationList.java | 41 +
.../apache/slider/api/types/RoleStatistics.java | 66 ++
.../org/apache/slider/client/SliderClient.java | 105 ++-
.../apache/slider/client/SliderClientAPI.java | 12 +
.../slider/client/SliderYarnClientImpl.java | 77 +-
.../client/ipc/SliderApplicationIpcClient.java | 3 +-
.../client/ipc/SliderClusterOperations.java | 24 +-
.../rest/SliderApplicationApiRestClient.java | 23 +-
.../apache/slider/common/SliderXmlConfKeys.java | 2 +
.../common/params/AbstractActionArgs.java | 6 +-
.../AbstractClusterBuildingActionArgs.java | 2 +-
.../common/params/ActionAMSuicideArgs.java | 1 -
.../slider/common/params/ActionEchoArgs.java | 7 +-
.../slider/common/params/ActionListArgs.java | 2 +-
.../slider/common/params/ActionLookupArgs.java | 2 +-
.../slider/common/params/ActionNodesArgs.java | 66 ++
.../slider/common/params/ActionStatusArgs.java | 3 +-
.../slider/common/params/ActionUpgradeArgs.java | 4 +-
.../slider/common/params/AddonArgsDelegate.java | 2 +-
.../params/AppAndResouceOptionArgsDelegate.java | 8 +-
.../org/apache/slider/common/params/ArgOps.java | 20 +-
.../apache/slider/common/params/Arguments.java | 8 +-
.../apache/slider/common/params/ClientArgs.java | 45 +-
.../apache/slider/common/params/CommonArgs.java | 16 +-
.../common/params/ComponentArgsDelegate.java | 2 +-
.../common/params/DontSplitArguments.java | 2 +-
.../slider/common/params/SliderActions.java | 2 +
.../apache/slider/common/tools/Comparators.java | 13 +-
.../apache/slider/common/tools/SliderUtils.java | 42 +-
.../slider/core/conf/ConfTreeOperations.java | 9 +
.../slider/core/launch/CommandLineBuilder.java | 55 --
.../slider/core/launch/ContainerLauncher.java | 12 +-
.../core/launch/JavaCommandLineBuilder.java | 70 +-
.../slider/core/persist/ConfPersister.java | 6 +-
.../slider/core/persist/JsonSerDeser.java | 45 +-
.../providers/AbstractProviderService.java | 12 +-
.../slider/providers/PlacementPolicy.java | 9 +-
.../apache/slider/providers/ProviderRole.java | 25 +-
.../slideram/SliderAMClientProvider.java | 19 +-
.../slideram/SliderAMProviderService.java | 3 +-
.../appmaster/ProtobufClusterServices.java | 6 +
.../server/appmaster/SliderAppMaster.java | 152 ++--
.../appmaster/actions/ActionKillContainer.java | 2 +-
.../server/appmaster/actions/QueueService.java | 8 +-
.../management/BoolMetricPredicate.java | 44 ++
.../server/appmaster/management/LongGauge.java | 86 ++-
.../management/LongMetricFunction.java | 44 ++
.../management/MetricsAndMonitoring.java | 51 +-
.../management/MetricsBindingService.java | 12 +-
.../appmaster/management/MetricsConstants.java | 2 +
.../management/PrefixedMetricsSet.java | 53 ++
.../operations/AbstractRMOperation.java | 2 +-
.../operations/CancelSingleRequest.java | 7 +-
.../operations/ContainerReleaseOperation.java | 3 +
.../operations/ContainerRequestOperation.java | 4 +-
.../server/appmaster/rpc/SliderIPCService.java | 10 +-
.../state/AbstractClusterServices.java | 28 +
.../slider/server/appmaster/state/AppState.java | 745 +++++++++++--------
.../appmaster/state/AppStateBindingInfo.java | 63 ++
.../appmaster/state/ContainerAllocation.java | 46 --
.../state/ContainerAllocationResults.java | 50 ++
.../appmaster/state/ContainerPriority.java | 5 +-
.../state/ContainerReleaseSelector.java | 5 +-
.../MostRecentContainerReleaseSelector.java | 3 +-
.../server/appmaster/state/NodeEntry.java | 25 +-
.../server/appmaster/state/NodeInstance.java | 141 +++-
.../slider/server/appmaster/state/NodeMap.java | 58 +-
.../appmaster/state/OutstandingRequest.java | 144 ++--
.../state/OutstandingRequestTracker.java | 122 ++-
.../appmaster/state/ProviderAppState.java | 11 +-
.../server/appmaster/state/RoleHistory.java | 395 ++++++----
.../appmaster/state/RoleHostnamePair.java | 75 ++
.../server/appmaster/state/RoleStatus.java | 375 +++++++---
.../appmaster/state/SimpleReleaseSelector.java | 3 +-
.../state/StateAccessForProviders.java | 7 +
.../server/appmaster/web/SliderAMWebApp.java | 2 +-
.../web/rest/AbstractSliderResource.java | 7 +-
.../server/appmaster/web/rest/RestPaths.java | 11 +
.../rest/application/ApplicationResource.java | 15 +-
.../resources/LiveNodesRefresher.java | 11 +-
.../resources/AggregateConfResource.java | 26 +-
.../web/view/ClusterSpecificationBlock.java | 13 +-
.../appmaster/web/view/ContainerStatsBlock.java | 12 +-
.../server/appmaster/web/view/IndexBlock.java | 184 +++--
.../server/appmaster/web/view/NavBlock.java | 27 +-
.../appmaster/web/view/SliderHamletBlock.java | 56 ++
.../src/main/proto/SliderClusterMessages.proto | 10 +-
.../test_min_pkg/sleep_cmd/appConfig.json | 7 +
.../test_min_pkg/sleep_cmd/metainfo.json | 34 +-
.../test_min_pkg/sleep_cmd/resources.json | 8 +-
.../agent/AgentMiniClusterTestBase.groovy | 11 +-
.../rest/AbstractAppApiTestDelegates.groovy | 10 +-
.../slider/agent/rest/TestStandaloneREST.groovy | 19 +-
.../standalone/TestBuildStandaloneAM.groovy | 4 -
.../slider/client/TestClientBadArgs.groovy | 64 +-
.../client/TestSliderClientMethods.groovy | 3 +-
.../client/TestUpgradeCommandOptions.groovy | 10 +-
.../slider/providers/agent/AgentTestBase.groovy | 15 +-
.../providers/agent/DemoAgentAAEcho.groovy | 49 ++
.../providers/agent/TestAgentAAEcho.groovy | 209 ++++++
.../slider/providers/agent/TestAgentEcho.groovy | 50 +-
.../providers/agent/TestBuildBasicAgent.groovy | 57 +-
.../appstate/BaseMockAppStateAATest.groovy | 62 ++
.../TestMockAppStateAAOvercapacity.groovy | 102 +++
.../appstate/TestMockAppStateAAPlacement.groovy | 340 +++++++++
.../TestMockAppStateAppRestIntegration.groovy | 5 -
.../TestMockAppStateContainerFailure.groovy | 8 +-
.../TestMockAppStateDynamicHistory.groovy | 42 +-
.../TestMockAppStateDynamicRoles.groovy | 76 +-
.../TestMockAppStateFlexDynamicRoles.groovy | 44 +-
.../appstate/TestMockAppStateFlexing.groovy | 3 +-
.../TestMockAppStateRMOperations.groovy | 4 +-
.../TestMockAppStateRebuildOnAMRestart.groovy | 47 +-
.../TestMockContainerResourceAllocations.groovy | 10 +-
.../appstate/TestMockLabelledAAPlacement.groovy | 139 ++++
.../model/history/TestRoleHistoryAA.groovy | 254 +++++++
.../TestRoleHistoryContainerEvents.groovy | 72 +-
...stRoleHistoryFindNodesForNewInstances.groovy | 25 +-
.../history/TestRoleHistoryNIComparators.groovy | 53 +-
...tRoleHistoryOutstandingRequestTracker.groovy | 122 ++-
.../model/history/TestRoleHistoryRW.groovy | 41 +-
.../history/TestRoleHistoryRWOrdering.groovy | 33 +-
.../TestRoleHistoryRequestTracking.groovy | 104 +--
.../model/mock/BaseMockAppStateTest.groovy | 218 ++++--
.../appmaster/model/mock/MockAppState.groovy | 11 +-
.../model/mock/MockClusterServices.groovy | 5 +
.../appmaster/model/mock/MockFactory.groovy | 54 +-
.../appmaster/model/mock/MockNodeReport.groovy | 75 ++
.../appmaster/model/mock/MockResource.groovy | 2 +-
.../appmaster/model/mock/MockRoleHistory.groovy | 13 +-
.../appmaster/model/mock/MockRoles.groovy | 2 +
.../appmaster/model/mock/MockYarnCluster.groovy | 26 +-
.../appmaster/model/mock/MockYarnEngine.groovy | 14 +-
.../appmaster/web/view/TestIndexBlock.groovy | 80 +-
.../slider/server/management/TestGauges.groovy | 52 ++
.../org/apache/slider/test/KeysForTests.groovy | 3 +-
.../apache/slider/test/SliderTestBase.groovy | 1 -
.../apache/slider/test/SliderTestUtils.groovy | 83 ++-
.../web/rest/agent/TestAMAgentWebServices.java | 47 +-
.../management/TestAMManagementWebServices.java | 92 +--
slider-core/src/test/python/agent.py | 25 +-
slider-core/src/test/python/agent/main.py | 18 +-
slider-core/src/test/python/echo.py | 23 +-
slider-core/src/test/python/metainfo.xml | 4 +-
.../src/test/resources/example-slider-test.xml | 70 --
slider-core/src/test/resources/log4j.properties | 2 +
.../core/conf/examples/app_configuration.json | 4 +-
.../core/conf/examples/internal-resolved.json | 2 +-
.../slider/core/conf/examples/internal.json | 2 +-
.../slider/core/conf/examples/resources.json | 2 +-
.../funtest/framework/CommandTestBase.groovy | 134 ++--
.../apache/slider/funtest/ResourcePaths.groovy | 41 +
.../funtest/basic/ClusterConnectivityIT.groovy | 9 +-
...nentConfigsInAppConfigShowUpOnAgentIT.groovy | 3 -
.../slider/funtest/basic/SyspropsIT.groovy | 3 +-
.../funtest/commands/CommandExitCodesIT.groovy | 1 -
.../funtest/commands/ListCommandIT.groovy | 1 -
.../funtest/commands/SimpleCommandsIT.groovy | 2 -
.../ApplicationWithAddonPackagesIT.groovy | 19 -
.../slider/funtest/lifecycle/AASleepIT.groovy | 161 ++++
.../AMClientCertStoreRetrievalIT.groovy | 27 +-
.../lifecycle/AgentClientInstallIT.groovy | 7 -
.../lifecycle/AgentClusterLifecycleIT.groovy | 3 +-
.../funtest/lifecycle/AgentFailures2IT.groovy | 4 +-
.../funtest/lifecycle/AgentFailuresIT.groovy | 4 +-
.../AgentLaunchFailureIT_Disabled.groovy | 3 +-
.../funtest/lifecycle/AgentMinSleepIT.groovy | 22 +-
.../funtest/lifecycle/AgentPingSocketIT.groovy | 17 +-
.../funtest/lifecycle/AgentRegistryIT.groovy | 4 +-
.../funtest/lifecycle/AgentWebPagesIT.groovy | 106 +--
.../lifecycle/AppsThroughAgentDemo.groovy | 45 --
.../funtest/lifecycle/AppsThroughAgentIT.groovy | 3 +-
.../AppsThroughAgentQueueAndLabelsIT.groovy | 4 +-
.../funtest/lifecycle/AppsUpgradeIT.groovy | 4 +-
.../lifecycle/ClusterBuildDestroyIT.groovy | 3 -
.../slider/funtest/lifecycle/DemoAASleep.groovy | 41 +
.../lifecycle/DemoAppsThroughAgent.groovy | 45 ++
189 files changed, 6043 insertions(+), 2666 deletions(-)
----------------------------------------------------------------------