SLIDER-538 ContainerReleaseSelector isn't being picked up from Provider
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/2037ac4a Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/2037ac4a Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/2037ac4a Branch: refs/heads/develop Commit: 2037ac4aef5e6ebe07851dfcfd17cceb9d7f0aeb Parents: ddc7236 Author: Steve Loughran <ste...@apache.org> Authored: Fri Feb 27 16:08:10 2015 -0800 Committer: Steve Loughran <ste...@apache.org> Committed: Fri Feb 27 16:08:10 2015 -0800 ---------------------------------------------------------------------- .../org/apache/slider/server/appmaster/SliderAppMaster.java | 2 +- .../org/apache/slider/server/appmaster/state/AppState.java | 2 +- .../model/appstate/TestMockAppStateFlexDynamicRoles.groovy | 8 +++++--- .../model/appstate/TestMockAppStateRebuildOnAMRestart.groovy | 5 +++-- 4 files changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/2037ac4a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java index c990c23..35ab1d4 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java @@ -848,7 +848,7 @@ public class SliderAppMaster extends AbstractSliderLaunchedService historyDir, liveContainers, appInformation, - new SimpleReleaseSelector()); + providerService.createContainerReleaseSelector()); providerService.rebuildContainerDetails(liveContainers, instanceDefinition.getName(), appState.getRolePriorityMap()); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/2037ac4a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java index 70b967d..9e2d2cf 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java @@ -514,7 +514,7 @@ public class AppState { Path historyDir, List<Container> liveContainers, Map<String, String> applicationInfo, - SimpleReleaseSelector releaseSelector) + ContainerReleaseSelector releaseSelector) throws BadClusterStateException, BadConfigException, IOException { Preconditions.checkArgument(instanceDefinition != null); Preconditions.checkArgument(releaseSelector != null); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/2037ac4a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateFlexDynamicRoles.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateFlexDynamicRoles.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateFlexDynamicRoles.groovy index 53299dd..b4f3978 100644 --- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateFlexDynamicRoles.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateFlexDynamicRoles.groovy @@ -29,7 +29,7 @@ import org.apache.slider.server.appmaster.model.mock.BaseMockAppStateTest import org.apache.slider.server.appmaster.model.mock.MockAppState import org.apache.slider.server.appmaster.model.mock.MockRoles import org.apache.slider.server.appmaster.model.mock.MockYarnEngine -import org.apache.slider.server.appmaster.state.SimpleReleaseSelector +import org.apache.slider.server.appmaster.state.MostRecentContainerReleaseSelector import org.apache.slider.server.avro.RoleHistoryWriter import org.junit.Test @@ -78,7 +78,8 @@ class TestMockAppStateFlexDynamicRoles extends BaseMockAppStateTest factory.ROLES, fs, historyPath, - null, null, new SimpleReleaseSelector()) + null, null, + new MostRecentContainerReleaseSelector()) } @@ -187,7 +188,8 @@ class TestMockAppStateFlexDynamicRoles extends BaseMockAppStateTest factory.ROLES, fs, historyPath2, - null, null, new SimpleReleaseSelector()) + null, null, + new MostRecentContainerReleaseSelector()) // on this read there won't be the right number of roles try { historyWriter.read(fs, history, appState.roleHistory) http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/2037ac4a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateRebuildOnAMRestart.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateRebuildOnAMRestart.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateRebuildOnAMRestart.groovy index b48a683..e0fdf1b 100644 --- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateRebuildOnAMRestart.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateRebuildOnAMRestart.groovy @@ -27,11 +27,11 @@ import org.apache.slider.server.appmaster.model.mock.BaseMockAppStateTest import org.apache.slider.server.appmaster.model.mock.MockAppState import org.apache.slider.server.appmaster.model.mock.MockRoles import org.apache.slider.server.appmaster.operations.AbstractRMOperation +import org.apache.slider.server.appmaster.state.MostRecentContainerReleaseSelector import org.apache.slider.server.appmaster.state.NodeEntry import org.apache.slider.server.appmaster.state.NodeInstance import org.apache.slider.server.appmaster.state.NodeMap import org.apache.slider.server.appmaster.state.RoleInstance -import org.apache.slider.server.appmaster.state.SimpleReleaseSelector import org.junit.Test /** @@ -82,7 +82,8 @@ class TestMockAppStateRebuildOnAMRestart extends BaseMockAppStateTest fs, historyPath, containers, - null, new SimpleReleaseSelector()) + null, + new MostRecentContainerReleaseSelector()) assert appState.getStartedCountainerCount() == clusterSize
