You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by te...@apache.org on 2014/11/14 01:19:14 UTC
[1/2] incubator-slider git commit: Put back detection of failed node
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 <yu...@gmail.com>
Authored: Thu Nov 13 16:18:51 2014 -0800
Committer: tedyu <yu...@gmail.com>
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;
[2/2] incubator-slider git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-slider into develop
Posted by te...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-slider 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/7d772088
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/7d772088
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/7d772088
Branch: refs/heads/develop
Commit: 7d7720881e2a680b4f9e137521497c5ba1e8c7eb
Parents: d511022 f50adbd
Author: tedyu <yu...@gmail.com>
Authored: Thu Nov 13 16:19:00 2014 -0800
Committer: tedyu <yu...@gmail.com>
Committed: Thu Nov 13 16:19:00 2014 -0800
----------------------------------------------------------------------
.../slider/agent/standalone/TestStandaloneAMRestart.groovy | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------