tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hit...@apache.org
Subject git commit: TEZ-1276. Remove unnecessary TaskAttemptEventType TA_FAIL_REQUEST. (Jeff Zhang via hitesh)
Date Wed, 30 Jul 2014 22:11:00 GMT
Repository: tez
Updated Branches:
  refs/heads/master 9aa38b08a -> 770e3058a


TEZ-1276. Remove unnecessary TaskAttemptEventType TA_FAIL_REQUEST. (Jeff Zhang via hitesh)


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/770e3058
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/770e3058
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/770e3058

Branch: refs/heads/master
Commit: 770e3058ab797369f8ae3a9acbeaecd97b7cb30e
Parents: 9aa38b0
Author: Hitesh Shah <hitesh@apache.org>
Authored: Wed Jul 30 15:10:15 2014 -0700
Committer: Hitesh Shah <hitesh@apache.org>
Committed: Wed Jul 30 15:10:15 2014 -0700

----------------------------------------------------------------------
 .../dag/event/TaskAttemptEventFailRequest.java  | 35 --------------------
 .../dag/app/dag/event/TaskAttemptEventType.java |  3 --
 .../tez/dag/app/dag/impl/TaskAttemptImpl.java   | 21 ------------
 3 files changed, 59 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/770e3058/tez-dag/src/main/java/org/apache/tez/dag/app/dag/event/TaskAttemptEventFailRequest.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/event/TaskAttemptEventFailRequest.java
b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/event/TaskAttemptEventFailRequest.java
deleted file mode 100644
index b2f9cfb..0000000
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/event/TaskAttemptEventFailRequest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.tez.dag.app.dag.event;
-
-import org.apache.tez.dag.records.TezTaskAttemptID;
-
-public class TaskAttemptEventFailRequest extends TaskAttemptEvent {
-
-  private final String message;
-
-  public TaskAttemptEventFailRequest(TezTaskAttemptID id, String message) {
-    super(id, TaskAttemptEventType.TA_FAIL_REQUEST);
-    this.message = message;
-  }
-
-  public String getMessage() {
-    return this.message;
-  }
-}

http://git-wip-us.apache.org/repos/asf/tez/blob/770e3058/tez-dag/src/main/java/org/apache/tez/dag/app/dag/event/TaskAttemptEventType.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/event/TaskAttemptEventType.java
b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/event/TaskAttemptEventType.java
index 35bd144..e7db8d1 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/event/TaskAttemptEventType.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/event/TaskAttemptEventType.java
@@ -36,9 +36,6 @@ public enum TaskAttemptEventType {
   TA_FAILED,
   TA_TIMED_OUT,
   
-//Producer: Client
-  TA_FAIL_REQUEST,
-  
 //Producer: Client, Scheduler, On speculation.
   TA_KILL_REQUEST,
 

http://git-wip-us.apache.org/repos/asf/tez/blob/770e3058/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java
index d23b458..e927b93 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java
@@ -186,10 +186,6 @@ public class TaskAttemptImpl implements TaskAttempt,
           TaskAttemptEventType.TA_DIAGNOSTICS_UPDATE,
           DIAGNOSTIC_INFORMATION_UPDATE_TRANSITION)
       .addTransition(TaskAttemptStateInternal.NEW,
-          TaskAttemptStateInternal.FAILED,
-          TaskAttemptEventType.TA_FAIL_REQUEST,
-          new TerminateTransition(FAILED_HELPER))
-      .addTransition(TaskAttemptStateInternal.NEW,
           TaskAttemptStateInternal.KILLED,
           TaskAttemptEventType.TA_KILL_REQUEST,
           new TerminateTransition(KILLED_HELPER))
@@ -210,10 +206,6 @@ public class TaskAttemptImpl implements TaskAttempt,
           TaskAttemptEventType.TA_DIAGNOSTICS_UPDATE,
           DIAGNOSTIC_INFORMATION_UPDATE_TRANSITION)
       .addTransition(TaskAttemptStateInternal.START_WAIT,
-          TaskAttemptStateInternal.FAIL_IN_PROGRESS,
-          TaskAttemptEventType.TA_FAIL_REQUEST,
-          new TerminatedBeforeRunningTransition(FAILED_HELPER))
-      .addTransition(TaskAttemptStateInternal.START_WAIT,
           TaskAttemptStateInternal.KILL_IN_PROGRESS,
           TaskAttemptEventType.TA_KILL_REQUEST,
           new TerminatedBeforeRunningTransition(KILLED_HELPER))
@@ -258,10 +250,6 @@ public class TaskAttemptImpl implements TaskAttempt,
           TaskAttemptEventType.TA_TIMED_OUT,
           new TerminatedWhileRunningTransition(FAILED_HELPER))
       .addTransition(TaskAttemptStateInternal.RUNNING,
-          TaskAttemptStateInternal.FAIL_IN_PROGRESS,
-          TaskAttemptEventType.TA_FAIL_REQUEST,
-          new TerminatedWhileRunningTransition(FAILED_HELPER))
-      .addTransition(TaskAttemptStateInternal.RUNNING,
           TaskAttemptStateInternal.KILL_IN_PROGRESS,
           TaskAttemptEventType.TA_KILL_REQUEST,
           new TerminatedWhileRunningTransition(KILLED_HELPER))
@@ -310,10 +298,6 @@ public class TaskAttemptImpl implements TaskAttempt,
           TaskAttemptStateInternal.FAIL_IN_PROGRESS,
           TaskAttemptEventType.TA_TIMED_OUT,
           new TerminatedWhileRunningTransition(FAILED_HELPER))
-      .addTransition(TaskAttemptStateInternal.OUTPUT_CONSUMABLE,
-          TaskAttemptStateInternal.FAIL_IN_PROGRESS,
-          TaskAttemptEventType.TA_FAIL_REQUEST,
-          new TerminatedWhileRunningTransition(FAILED_HELPER))
       // TODO CREUSE Ensure TaskCompletionEvents are updated to reflect this.
       // Something needs to go out to the job.
       .addTransition(TaskAttemptStateInternal.OUTPUT_CONSUMABLE,
@@ -361,7 +345,6 @@ public class TaskAttemptImpl implements TaskAttempt,
               TaskAttemptEventType.TA_COMMIT_PENDING,
               TaskAttemptEventType.TA_DONE, TaskAttemptEventType.TA_FAILED,
               TaskAttemptEventType.TA_TIMED_OUT,
-              TaskAttemptEventType.TA_FAIL_REQUEST,
               TaskAttemptEventType.TA_KILL_REQUEST,
               TaskAttemptEventType.TA_NODE_FAILED,
               TaskAttemptEventType.TA_CONTAINER_TERMINATING,
@@ -385,7 +368,6 @@ public class TaskAttemptImpl implements TaskAttempt,
               TaskAttemptEventType.TA_COMMIT_PENDING,
               TaskAttemptEventType.TA_DONE, TaskAttemptEventType.TA_FAILED,
               TaskAttemptEventType.TA_TIMED_OUT,
-              TaskAttemptEventType.TA_FAIL_REQUEST,
               TaskAttemptEventType.TA_KILL_REQUEST,
               TaskAttemptEventType.TA_NODE_FAILED,
               TaskAttemptEventType.TA_CONTAINER_TERMINATING,
@@ -406,7 +388,6 @@ public class TaskAttemptImpl implements TaskAttempt,
               TaskAttemptEventType.TA_COMMIT_PENDING,
               TaskAttemptEventType.TA_DONE, TaskAttemptEventType.TA_FAILED,
               TaskAttemptEventType.TA_TIMED_OUT,
-              TaskAttemptEventType.TA_FAIL_REQUEST,
               TaskAttemptEventType.TA_KILL_REQUEST,
               TaskAttemptEventType.TA_NODE_FAILED,
               TaskAttemptEventType.TA_CONTAINER_TERMINATING,
@@ -428,7 +409,6 @@ public class TaskAttemptImpl implements TaskAttempt,
               TaskAttemptEventType.TA_COMMIT_PENDING,
               TaskAttemptEventType.TA_DONE, TaskAttemptEventType.TA_FAILED,
               TaskAttemptEventType.TA_TIMED_OUT,
-              TaskAttemptEventType.TA_FAIL_REQUEST,
               TaskAttemptEventType.TA_KILL_REQUEST,
               TaskAttemptEventType.TA_NODE_FAILED,
               TaskAttemptEventType.TA_CONTAINER_TERMINATING,
@@ -464,7 +444,6 @@ public class TaskAttemptImpl implements TaskAttempt,
           TaskAttemptStateInternal.SUCCEEDED,
           TaskAttemptStateInternal.SUCCEEDED,
           EnumSet.of(TaskAttemptEventType.TA_TIMED_OUT,
-              TaskAttemptEventType.TA_FAIL_REQUEST,
               TaskAttemptEventType.TA_CONTAINER_TERMINATING,
               TaskAttemptEventType.TA_CONTAINER_TERMINATED,
               TaskAttemptEventType.TA_CONTAINER_TERMINATED_BY_SYSTEM))


Mime
View raw message