Merge branch 'feature/SLIDER-799-AM-managed-relax' 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/5f397d7d Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/5f397d7d Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/5f397d7d Branch: refs/heads/develop Commit: 5f397d7da213aa319cec1257e4d8a1c106f1b6d1 Parents: 63627bc fd14eef Author: Steve Loughran <[email protected]> Authored: Wed Mar 25 20:28:02 2015 +0000 Committer: Steve Loughran <[email protected]> Committed: Wed Mar 25 20:28:02 2015 +0000 ---------------------------------------------------------------------- app-packages/accumulo/jmx_metrics.json | 76 ++--- app-packages/accumulo/resources-default.json | 1 - app-packages/accumulo/timeline_metrics.json | 70 ++--- .../app-pkg-template/resources-default.json | 8 +- .../command-logger/slider-pkg/appConfig.json | 35 ++- .../command-logger/slider-pkg/resources.json | 23 +- app-packages/hbase-win/resources-default.json | 27 +- app-packages/hbase/resources-default.json | 15 +- .../org/apache/slider/api/InternalKeys.java | 12 +- .../org/apache/slider/api/ResourceKeys.java | 22 ++ .../org/apache/slider/api/proto/Messages.java | 223 ++++++++++++-- .../slider/api/proto/RestTypeMarshalling.java | 8 +- .../slider/api/types/ContainerInformation.java | 4 +- .../apache/slider/common/tools/SliderUtils.java | 5 +- .../slider/core/launch/AbstractLauncher.java | 19 +- .../slider/core/launch/AppMasterLauncher.java | 6 +- .../core/launch/ClasspathConstructor.java | 2 +- .../slider/core/launch/CommandLineBuilder.java | 2 +- .../slider/core/main/ServiceShutdownHook.java | 4 +- .../providers/AbstractProviderService.java | 5 + .../slider/providers/PlacementPolicy.java | 10 +- .../apache/slider/providers/ProviderRole.java | 28 +- .../slideram/SliderAMClientProvider.java | 3 +- .../server/appmaster/RoleLaunchService.java | 38 +-- .../server/appmaster/SliderAppMaster.java | 55 +++- .../actions/EscalateOutstandingRequests.java | 45 +++ .../appmaster/management/MetricsConstants.java | 33 +- .../operations/AsyncRMOperationHandler.java | 14 +- .../operations/CancelRequestOperation.java | 58 ---- .../operations/CancelSingleRequest.java | 49 +++ .../ProviderNotifyingOperationHandler.java | 5 + .../operations/RMOperationHandlerActions.java | 12 +- .../slider/server/appmaster/state/AppState.java | 253 +++++++++------- .../appmaster/state/ContainerAllocation.java | 46 +++ .../state/ContainerAllocationOutcome.java | 44 +++ .../appmaster/state/ContainerAssignment.java | 31 +- .../MostRecentContainerReleaseSelector.java | 2 +- .../server/appmaster/state/NodeEntry.java | 7 +- .../server/appmaster/state/NodeInstance.java | 67 +++-- .../slider/server/appmaster/state/NodeMap.java | 4 +- .../appmaster/state/OutstandingRequest.java | 228 +++++++++++--- .../state/OutstandingRequestTracker.java | 299 ++++++++++++++++--- .../appmaster/state/ProviderAppState.java | 12 +- .../server/appmaster/state/RoleHistory.java | 190 ++++++++---- .../server/appmaster/state/RoleInstance.java | 21 +- .../server/appmaster/state/RoleStatus.java | 28 +- .../resources/LiveContainersRefresher.java | 2 +- .../slider/server/avro/NewerFilesFirst.java | 43 +++ .../slider/server/avro/OlderFilesFirst.java | 43 +++ .../slider/server/avro/RoleHistoryWriter.java | 62 +--- .../src/main/proto/SliderClusterMessages.proto | 1 + .../TestMockAppStateDynamicRoles.groovy | 3 +- .../appstate/TestMockAppStateFlexing.groovy | 20 +- .../TestMockAppStateRMOperations.groovy | 62 ++-- .../TestMockAppStateRebuildOnAMRestart.groovy | 4 +- .../TestMockAppStateRolePlacement.groovy | 16 +- .../TestRoleHistoryContainerEvents.groovy | 4 +- ...stRoleHistoryFindNodesForNewInstances.groovy | 22 ++ .../history/TestRoleHistoryNIComparators.groovy | 24 +- ...tRoleHistoryOutstandingRequestTracker.groovy | 221 ++++++++++++-- .../history/TestRoleHistoryRWOrdering.groovy | 3 +- .../TestRoleHistoryRequestTracking.groovy | 93 +++--- .../appmaster/model/mock/Allocator.groovy | 1 + .../model/mock/BaseMockAppStateTest.groovy | 2 +- .../appmaster/model/mock/MockFactory.groovy | 20 +- .../appmaster/model/mock/MockPriority.groovy | 43 +++ .../model/mock/MockProviderService.groovy | 5 + .../model/mock/MockRMOperationHandler.groovy | 11 +- .../appmaster/model/mock/MockYarnEngine.groovy | 2 +- .../lifecycle/AgentLaunchFailureIT.groovy | 114 ------- .../AgentLaunchFailureIT_Disabled.groovy | 117 ++++++++ 71 files changed, 2242 insertions(+), 845 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5f397d7d/slider-core/src/main/java/org/apache/slider/api/InternalKeys.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5f397d7d/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java ----------------------------------------------------------------------
