You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by hi...@apache.org on 2013/09/11 02:45:59 UTC
git commit: TEZ-430. Remove use of event lock. (hitesh)
Updated Branches:
refs/heads/TEZ-398 d9fc91d56 -> e5919fa75
TEZ-430. Remove use of event lock. (hitesh)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tez/commit/e5919fa7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/e5919fa7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/e5919fa7
Branch: refs/heads/TEZ-398
Commit: e5919fa75ae1d228cd5931c1fff382ab8c2354a7
Parents: d9fc91d
Author: Hitesh Shah <hi...@apache.org>
Authored: Tue Sep 10 17:45:33 2013 -0700
Committer: Hitesh Shah <hi...@apache.org>
Committed: Tue Sep 10 17:45:33 2013 -0700
----------------------------------------------------------------------
.../apache/hadoop/mapred/YarnTezDagChild.java | 30 ++++++++------------
1 file changed, 12 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/e5919fa7/tez-dag/src/main/java/org/apache/hadoop/mapred/YarnTezDagChild.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/hadoop/mapred/YarnTezDagChild.java b/tez-dag/src/main/java/org/apache/hadoop/mapred/YarnTezDagChild.java
index 462c30e..6a0fff4 100644
--- a/tez-dag/src/main/java/org/apache/hadoop/mapred/YarnTezDagChild.java
+++ b/tez-dag/src/main/java/org/apache/hadoop/mapred/YarnTezDagChild.java
@@ -28,7 +28,6 @@ import java.net.InetSocketAddress;
import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
@@ -113,7 +112,6 @@ public class YarnTezDagChild {
private static TezTaskAttemptID currentTaskAttemptID;
private static long amPollInterval;
private static TezTaskUmbilicalProtocol umbilical;
- private static Object eventLock = new Object();
private static ReentrantReadWriteLock taskLock = new ReentrantReadWriteLock();
private static LogicalIOProcessorRuntimeTask currentTask = null;
@@ -220,20 +218,18 @@ public class YarnTezDagChild {
} finally {
taskLock.readLock().unlock();
}
- synchronized (eventLock) {
- List<TezEvent> events = new ArrayList<TezEvent>();
- eventsToSend.drainTo(events);
- long reqId = requestCounter.incrementAndGet();
- TezHeartbeatRequest request = new TezHeartbeatRequest(reqId, events,
- currentTaskAttemptID, eventCounter, maxEventsToGet);
- TezHeartbeatResponse response = umbilical.heartbeat(request);
- if (response.getLastRequestId() != reqId) {
- // TODO TODONEWTEZ
- throw new TezException("AM and Task out of sync");
- }
- eventCounter += response.getEvents().size();
- eventsToBeProcessed.addAll(response.getEvents());
+ List<TezEvent> events = new ArrayList<TezEvent>();
+ eventsToSend.drainTo(events);
+ long reqId = requestCounter.incrementAndGet();
+ TezHeartbeatRequest request = new TezHeartbeatRequest(reqId, events,
+ currentTaskAttemptID, eventCounter, maxEventsToGet);
+ TezHeartbeatResponse response = umbilical.heartbeat(request);
+ if (response.getLastRequestId() != reqId) {
+ // TODO TODONEWTEZ
+ throw new TezException("AM and Task out of sync");
}
+ eventCounter += response.getEvents().size();
+ eventsToBeProcessed.addAll(response.getEvents());
}
public static void main(String[] args) throws Throwable {
@@ -310,9 +306,7 @@ public class YarnTezDagChild {
TezUmbilical tezUmbilical = new TezUmbilical() {
@Override
public void addEvents(Collection<TezEvent> events) {
- synchronized (eventLock) {
- eventsToSend.addAll(events);
- }
+ eventsToSend.addAll(events);
}
};