Repository: incubator-slider Updated Branches: refs/heads/develop f50adbda7 -> 7d7720881
Put back detection of failed node Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/d511022b Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/d511022b Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/d511022b Branch: refs/heads/develop Commit: d511022bd3d69386dc32c37db5e7a39126201206 Parents: b863602 Author: tedyu <[email protected]> Authored: Thu Nov 13 16:18:51 2014 -0800 Committer: tedyu <[email protected]> Committed: Thu Nov 13 16:18:51 2014 -0800 ---------------------------------------------------------------------- .../org/apache/slider/server/appmaster/state/RoleHistory.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/d511022b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleHistory.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleHistory.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleHistory.java index ce2ab0a..f57ca3f 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleHistory.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleHistory.java @@ -750,7 +750,11 @@ public class RoleHistory { available = false; } else { available = nodeEntry.containerCompleted(wasReleased); - maybeQueueNodeForWork(container, nodeEntry, available); + boolean isFailedNode = failedNodes.contains(RoleHistoryUtils + .hostnameOf(container)); + if (!isFailedNode) { + maybeQueueNodeForWork(container, nodeEntry, available); + } } touch(); return available;
