SLIDER-1048 rename NO_DATA_LOCALITY placement policy to ANYWHERE
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/7dc4d788 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/7dc4d788 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/7dc4d788 Branch: refs/heads/develop Commit: 7dc4d788289fa4f75f5d7957e9c956fa5e0575b4 Parents: 353d56f Author: Steve Loughran <ste...@apache.org> Authored: Wed Jan 6 19:19:12 2016 +0000 Committer: Steve Loughran <ste...@apache.org> Committed: Wed Jan 6 19:19:12 2016 +0000 ---------------------------------------------------------------------- .../java/org/apache/slider/providers/PlacementPolicy.java | 8 +++++++- .../org/apache/slider/server/appmaster/state/RoleStatus.java | 3 +-- .../slider/server/appmaster/model/mock/MockFactory.groovy | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7dc4d788/slider-core/src/main/java/org/apache/slider/providers/PlacementPolicy.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/providers/PlacementPolicy.java b/slider-core/src/main/java/org/apache/slider/providers/PlacementPolicy.java index 71d7566..128dd5d 100644 --- a/slider-core/src/main/java/org/apache/slider/providers/PlacementPolicy.java +++ b/slider-core/src/main/java/org/apache/slider/providers/PlacementPolicy.java @@ -43,7 +43,13 @@ public class PlacementPolicy { /** * No data locality; do not use placement history */ - public static final int NO_DATA_LOCALITY = 2; + public static final int ANYWHERE = 2; + + /** + * @Deprecated: use {@link #ANYWHERE} + */ + @Deprecated + public static final int NO_DATA_LOCALITY = ANYWHERE; /** * Anti-affinity is mandatory. http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7dc4d788/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleStatus.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleStatus.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleStatus.java index 656f96c..ce0d60e 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleStatus.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleStatus.java @@ -26,7 +26,6 @@ import org.apache.slider.api.types.ComponentInformation; import org.apache.slider.api.types.RoleStatistics; import org.apache.slider.providers.PlacementPolicy; import org.apache.slider.providers.ProviderRole; -import org.apache.slider.server.appmaster.management.BoolMetric; import org.apache.slider.server.appmaster.management.BoolMetricPredicate; import org.apache.slider.server.appmaster.management.LongGauge; @@ -166,7 +165,7 @@ public final class RoleStatus implements Cloneable, MetricSet { } public boolean isPlacementDesired() { - return !hasPlacementPolicy(PlacementPolicy.NO_DATA_LOCALITY); + return !hasPlacementPolicy(PlacementPolicy.ANYWHERE); } public long getDesired() { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7dc4d788/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockFactory.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockFactory.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockFactory.groovy index 4bbfbd8..d873390 100644 --- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockFactory.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/mock/MockFactory.groovy @@ -71,7 +71,7 @@ class MockFactory implements MockRoles { public static final ProviderRole PROVIDER_ROLE2 = new ProviderRole( MockRoles.ROLE2, 2, - PlacementPolicy.NO_DATA_LOCALITY, + PlacementPolicy.ANYWHERE, 2, 2, ResourceKeys.DEF_YARN_LABEL_EXPRESSION)
