SPARK-1051: priority check logic broken. Rather than try and get it right, turn off the check; we know that YARN will reject things itself.
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/be14bdd8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/be14bdd8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/be14bdd8 Branch: refs/heads/feature/SLIDER-906_docker_support Commit: be14bdd80efb2f0e480c15e849b5030bd604a60b Parents: 7e86e9f Author: Steve Loughran <ste...@apache.org> Authored: Thu Jan 14 15:49:14 2016 -0800 Committer: Steve Loughran <ste...@apache.org> Committed: Thu Jan 14 15:49:14 2016 -0800 ---------------------------------------------------------------------- .../server/appmaster/state/OutstandingRequest.java | 12 ------------ 1 file changed, 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/be14bdd8/slider-core/src/main/java/org/apache/slider/server/appmaster/state/OutstandingRequest.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/OutstandingRequest.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/OutstandingRequest.java index 7cd1f0c..e0b01a1 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/OutstandingRequest.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/OutstandingRequest.java @@ -413,18 +413,6 @@ public final class OutstandingRequest extends RoleHostnamePair { throw new InvalidContainerRequestException( "Cannot specify node label with rack or node: " + requestDetails); } - - // relax priority - boolean hasLocation = ContainerPriority.hasLocation(priority); - boolean relaxLocality = containerRequest.getRelaxLocality(); - if (relaxLocality != !hasLocation) { - throw new InvalidContainerRequestException( - "relax location flag " + relaxLocality - +" doesn't match container location flag in priority " + hasLocation - +": " - + requestDetails); - - } } /**
