You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by bi...@apache.org on 2014/03/06 01:05:12 UTC
git commit: Addendum to TEZ-804. Remove comments to add test since
test has been added. Some new logs added. (bikas)
Repository: incubator-tez
Updated Branches:
refs/heads/master 5b464f27d -> 66b374e58
Addendum to TEZ-804. Remove comments to add test since test has been added. Some new logs added. (bikas)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tez/commit/66b374e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/66b374e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/66b374e5
Branch: refs/heads/master
Commit: 66b374e58258b3cddeaf1c73b5af695c23027b05
Parents: 5b464f2
Author: Bikas Saha <bi...@apache.org>
Authored: Wed Mar 5 16:05:04 2014 -0800
Committer: Bikas Saha <bi...@apache.org>
Committed: Wed Mar 5 16:05:04 2014 -0800
----------------------------------------------------------------------
.../main/java/org/apache/tez/dag/app/rm/node/AMNodeImpl.java | 4 ++++
.../main/java/org/apache/tez/dag/app/rm/node/AMNodeMap.java | 8 ++++----
2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/66b374e5/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeImpl.java
index e7a5563..8403f09 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeImpl.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeImpl.java
@@ -287,6 +287,10 @@ public class AMNodeImpl implements AMNode {
@Override
public AMNodeState transition(AMNodeImpl node, AMNodeEvent nEvent) {
AMNodeEventTaskAttemptEnded event = (AMNodeEventTaskAttemptEnded) nEvent;
+ LOG.info("Attempt failed on node: " + node.getNodeId() + " TA: "
+ + event.getTaskAttemptId() + " failed: " + event.failed()
+ + " container: " + event.getContainerId() + " numFailedTAs: "
+ + node.numFailedTAs);
if (event.failed()) {
// ignore duplicate attempt ids
if (node.failedAttemptIds.add(event.getTaskAttemptId())) {
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/66b374e5/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeMap.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeMap.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeMap.java
index f815836..e25b713 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeMap.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/node/AMNodeMap.java
@@ -53,8 +53,6 @@ public class AMNodeMap extends AbstractService implements
private int blacklistDisablePercent;
- // TODO XXX Ensure there's a test for IgnoreBlacklisting in
- // TestRMContainerAllocator. Otherwise add one.
@SuppressWarnings("rawtypes")
public AMNodeMap(EventHandler eventHandler, AppContext appContext) {
super("AMNodeMap");
@@ -88,8 +86,10 @@ public class AMNodeMap extends AbstractService implements
}
public void nodeSeen(NodeId nodeId) {
- nodeMap.putIfAbsent(nodeId, new AMNodeImpl(nodeId, maxTaskFailuresPerNode,
- eventHandler, nodeBlacklistingEnabled, appContext));
+ if (nodeMap.putIfAbsent(nodeId, new AMNodeImpl(nodeId, maxTaskFailuresPerNode,
+ eventHandler, nodeBlacklistingEnabled, appContext)) == null) {
+ LOG.info("Adding new node: " + nodeId);
+ }
}
// Interface for the scheduler to check about a specific host.