You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by zj...@apache.org on 2015/06/03 03:48:19 UTC
tez git commit: TEZ-2376. Remove
TaskAttemptEventType.TA_DIAGNOSTICS_UPDATE (zjffdu)
Repository: tez
Updated Branches:
refs/heads/master 44a6bb686 -> a3950efd2
TEZ-2376. Remove TaskAttemptEventType.TA_DIAGNOSTICS_UPDATE (zjffdu)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/a3950efd
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/a3950efd
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/a3950efd
Branch: refs/heads/master
Commit: a3950efd204d309a1aa6781d266c1e37e6b81b2a
Parents: 44a6bb6
Author: Jeff Zhang <zj...@apache.org>
Authored: Wed Jun 3 09:48:00 2015 +0800
Committer: Jeff Zhang <zj...@apache.org>
Committed: Wed Jun 3 09:48:00 2015 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../TaskAttemptEventDiagnosticsUpdate.java | 36 --------------
.../dag/app/dag/event/TaskAttemptEventType.java | 9 ++--
.../tez/dag/app/dag/impl/TaskAttemptImpl.java | 50 --------------------
.../tez/dag/app/dag/impl/TestTaskImpl.java | 16 -------
5 files changed, 5 insertions(+), 107 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/a3950efd/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 0f1eabd..c90e1cc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,7 @@ INCOMPATIBLE CHANGES
TEZ-2468. Change the minimum Java version to Java 7.
ALL CHANGES:
+ TEZ-2376. Remove TaskAttemptEventType.TA_DIAGNOSTICS_UPDATE
TEZ-2509. YarnTaskSchedulerService should not try to allocate containers if AM is shutting down.
TEZ-2506. TestAysncHttpConnection failing.
TEZ-2503. findbugs version isn't reported properly in test-patch report.
http://git-wip-us.apache.org/repos/asf/tez/blob/a3950efd/tez-dag/src/main/java/org/apache/tez/dag/app/dag/event/TaskAttemptEventDiagnosticsUpdate.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/event/TaskAttemptEventDiagnosticsUpdate.java b/tez-dag/src/main/java/org/apache/tez/dag/app/dag/event/TaskAttemptEventDiagnosticsUpdate.java
deleted file mode 100644
index 0a1ca74..0000000
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/dag/event/TaskAttemptEventDiagnosticsUpdate.java
+++ /dev/null
@@ -1,36 +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 TaskAttemptEventDiagnosticsUpdate extends TaskAttemptEvent {
-
- private String diagnosticInfo;
-
- public TaskAttemptEventDiagnosticsUpdate(TezTaskAttemptID attemptID,
- String diagnosticInfo) {
- super(attemptID, TaskAttemptEventType.TA_DIAGNOSTICS_UPDATE);
- this.diagnosticInfo = diagnosticInfo;
- }
-
- public String getDiagnosticInfo() {
- return diagnosticInfo;
- }
-}
http://git-wip-us.apache.org/repos/asf/tez/blob/a3950efd/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 b7aca36..228de71 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
@@ -23,21 +23,20 @@ package org.apache.tez.dag.app.dag.event;
*/
public enum TaskAttemptEventType {
-//Producer:Task, Speculator
+ //Producer:Task, Speculator
TA_SCHEDULE,
-//Producer: TaskAttemptListener
+ //Producer: TaskAttemptListener
TA_STARTED_REMOTELY,
TA_STATUS_UPDATE,
- TA_DIAGNOSTICS_UPDATE, // REMOVE THIS - UNUSED
TA_DONE,
TA_FAILED,
TA_TIMED_OUT,
-//Producer: Client, Scheduler, On speculation.
+ //Producer: Client, Scheduler, On speculation.
TA_KILL_REQUEST,
-//Producer: Container / Scheduler.
+ //Producer: Container / Scheduler.
// Container may be running and is in the process of shutting down.
TA_CONTAINER_TERMINATING,
http://git-wip-us.apache.org/repos/asf/tez/blob/a3950efd/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 2650be2..9e47287 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
@@ -74,7 +74,6 @@ import org.apache.tez.dag.app.dag.event.DiagnosableEvent;
import org.apache.tez.dag.app.dag.event.TaskAttemptEvent;
import org.apache.tez.dag.app.dag.event.TaskAttemptEventAttemptFailed;
import org.apache.tez.dag.app.dag.event.TaskAttemptEventContainerTerminated;
-import org.apache.tez.dag.app.dag.event.TaskAttemptEventDiagnosticsUpdate;
import org.apache.tez.dag.app.dag.event.TaskAttemptEventTerminationCauseEvent;
import org.apache.tez.dag.app.dag.event.TaskAttemptEventOutputFailed;
import org.apache.tez.dag.app.dag.event.TaskAttemptEventSchedule;
@@ -171,10 +170,6 @@ public class TaskAttemptImpl implements TaskAttempt,
protected static final KilledTransitionHelper KILLED_HELPER =
new KilledTransitionHelper();
-
- private static SingleArcTransition<TaskAttemptImpl, TaskAttemptEvent>
- DIAGNOSTIC_INFORMATION_UPDATE_TRANSITION =
- new DiagnosticInformationUpdater();
private static SingleArcTransition<TaskAttemptImpl, TaskAttemptEvent>
TERMINATED_AFTER_SUCCESS_HELPER = new TerminatedAfterSuccessHelper(KILLED_HELPER);
@@ -195,10 +190,6 @@ public class TaskAttemptImpl implements TaskAttempt,
EnumSet.of(TaskAttemptStateInternal.START_WAIT, TaskAttemptStateInternal.FAILED),
TaskAttemptEventType.TA_SCHEDULE, new ScheduleTaskattemptTransition())
.addTransition(TaskAttemptStateInternal.NEW,
- TaskAttemptStateInternal.NEW,
- TaskAttemptEventType.TA_DIAGNOSTICS_UPDATE,
- DIAGNOSTIC_INFORMATION_UPDATE_TRANSITION)
- .addTransition(TaskAttemptStateInternal.NEW,
TaskAttemptStateInternal.KILLED,
TaskAttemptEventType.TA_KILL_REQUEST,
new TerminateTransition(KILLED_HELPER))
@@ -215,10 +206,6 @@ public class TaskAttemptImpl implements TaskAttempt,
TaskAttemptStateInternal.RUNNING,
TaskAttemptEventType.TA_STARTED_REMOTELY, new StartedTransition())
.addTransition(TaskAttemptStateInternal.START_WAIT,
- TaskAttemptStateInternal.START_WAIT,
- TaskAttemptEventType.TA_DIAGNOSTICS_UPDATE,
- DIAGNOSTIC_INFORMATION_UPDATE_TRANSITION)
- .addTransition(TaskAttemptStateInternal.START_WAIT,
TaskAttemptStateInternal.KILL_IN_PROGRESS,
TaskAttemptEventType.TA_KILL_REQUEST,
new TerminatedBeforeRunningTransition(KILLED_HELPER))
@@ -242,10 +229,6 @@ public class TaskAttemptImpl implements TaskAttempt,
.addTransition(TaskAttemptStateInternal.RUNNING,
TaskAttemptStateInternal.RUNNING,
TaskAttemptEventType.TA_STATUS_UPDATE, STATUS_UPDATER)
- .addTransition(TaskAttemptStateInternal.RUNNING,
- TaskAttemptStateInternal.RUNNING,
- TaskAttemptEventType.TA_DIAGNOSTICS_UPDATE,
- DIAGNOSTIC_INFORMATION_UPDATE_TRANSITION)
// Optional, may not come in for all tasks.
.addTransition(TaskAttemptStateInternal.RUNNING,
TaskAttemptStateInternal.SUCCEEDED, TaskAttemptEventType.TA_DONE,
@@ -289,10 +272,6 @@ public class TaskAttemptImpl implements TaskAttempt,
TaskAttemptStateInternal.KILLED,
TaskAttemptEventType.TA_CONTAINER_TERMINATED,
new ContainerCompletedWhileTerminating())
- .addTransition(TaskAttemptStateInternal.KILL_IN_PROGRESS,
- TaskAttemptStateInternal.KILL_IN_PROGRESS,
- TaskAttemptEventType.TA_DIAGNOSTICS_UPDATE,
- DIAGNOSTIC_INFORMATION_UPDATE_TRANSITION)
.addTransition(
TaskAttemptStateInternal.KILL_IN_PROGRESS,
TaskAttemptStateInternal.KILL_IN_PROGRESS,
@@ -310,10 +289,6 @@ public class TaskAttemptImpl implements TaskAttempt,
TaskAttemptStateInternal.FAILED,
TaskAttemptEventType.TA_CONTAINER_TERMINATED,
new ContainerCompletedWhileTerminating())
- .addTransition(TaskAttemptStateInternal.FAIL_IN_PROGRESS,
- TaskAttemptStateInternal.FAIL_IN_PROGRESS,
- TaskAttemptEventType.TA_DIAGNOSTICS_UPDATE,
- DIAGNOSTIC_INFORMATION_UPDATE_TRANSITION)
.addTransition(
TaskAttemptStateInternal.FAIL_IN_PROGRESS,
TaskAttemptStateInternal.FAIL_IN_PROGRESS,
@@ -327,10 +302,6 @@ public class TaskAttemptImpl implements TaskAttempt,
TaskAttemptEventType.TA_CONTAINER_TERMINATING,
TaskAttemptEventType.TA_OUTPUT_FAILED))
- .addTransition(TaskAttemptStateInternal.KILLED,
- TaskAttemptStateInternal.KILLED,
- TaskAttemptEventType.TA_DIAGNOSTICS_UPDATE,
- DIAGNOSTIC_INFORMATION_UPDATE_TRANSITION)
.addTransition(
TaskAttemptStateInternal.KILLED,
TaskAttemptStateInternal.KILLED,
@@ -346,10 +317,6 @@ public class TaskAttemptImpl implements TaskAttempt,
TaskAttemptEventType.TA_CONTAINER_TERMINATED,
TaskAttemptEventType.TA_OUTPUT_FAILED))
- .addTransition(TaskAttemptStateInternal.FAILED,
- TaskAttemptStateInternal.FAILED,
- TaskAttemptEventType.TA_DIAGNOSTICS_UPDATE,
- DIAGNOSTIC_INFORMATION_UPDATE_TRANSITION)
.addTransition(
TaskAttemptStateInternal.FAILED,
TaskAttemptStateInternal.FAILED,
@@ -368,10 +335,6 @@ public class TaskAttemptImpl implements TaskAttempt,
// How will duplicate history events be handled ?
// TODO Maybe consider not failing REDUCE tasks in this case. Also,
// MAP_TASKS in case there's only one phase in the job.
- .addTransition(TaskAttemptStateInternal.SUCCEEDED,
- TaskAttemptStateInternal.SUCCEEDED,
- TaskAttemptEventType.TA_DIAGNOSTICS_UPDATE,
- DIAGNOSTIC_INFORMATION_UPDATE_TRANSITION)
.addTransition(
TaskAttemptStateInternal.SUCCEEDED,
EnumSet.of(TaskAttemptStateInternal.KILLED,
@@ -1073,19 +1036,6 @@ public class TaskAttemptImpl implements TaskAttempt,
}
}
- protected static class DiagnosticInformationUpdater implements
- SingleArcTransition<TaskAttemptImpl, TaskAttemptEvent> {
- @Override
- public void transition(TaskAttemptImpl ta, TaskAttemptEvent event) {
- TaskAttemptEventDiagnosticsUpdate diagEvent = (TaskAttemptEventDiagnosticsUpdate) event;
- if (LOG.isDebugEnabled()) {
- LOG.debug("Diagnostics update for " + ta.attemptId + ": "
- + diagEvent.getDiagnosticInfo());
- }
- ta.addDiagnosticInfo(diagEvent.getDiagnosticInfo());
- }
- }
-
protected static class TerminateTransition implements
SingleArcTransition<TaskAttemptImpl, TaskAttemptEvent> {
http://git-wip-us.apache.org/repos/asf/tez/blob/a3950efd/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskImpl.java b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskImpl.java
index 87dd2fa..9e5d395 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskImpl.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestTaskImpl.java
@@ -55,7 +55,6 @@ import org.apache.tez.dag.app.TaskHeartbeatHandler;
import org.apache.tez.dag.app.dag.StateChangeNotifier;
import org.apache.tez.dag.app.dag.TaskStateInternal;
import org.apache.tez.dag.app.dag.Vertex;
-import org.apache.tez.dag.app.dag.event.TaskAttemptEventDiagnosticsUpdate;
import org.apache.tez.dag.app.dag.event.TaskEventScheduleTask;
import org.apache.tez.dag.app.dag.event.TaskEventTAUpdate;
import org.apache.tez.dag.app.dag.event.TaskEventTermination;
@@ -614,21 +613,6 @@ public class TestTaskImpl {
}
@Test(timeout = 5000)
- public void testDiagnostics_TAUpdate(){
- TezTaskID taskId = getNewTaskID();
- scheduleTaskAttempt(taskId);
- mockTask.handle(new TaskEventTAUpdate(mockTask.getLastAttempt().getID(), TaskEventType.T_ATTEMPT_KILLED));
- assertEquals(1, mockTask.getDiagnostics().size());
- assertEquals("TaskAttempt 0 killed", mockTask.getDiagnostics().get(0));
-
- launchTaskAttempt(mockTask.getLastAttempt().getID());
- mockTask.getLastAttempt().handle(new TaskAttemptEventDiagnosticsUpdate(mockTask.getLastAttempt().getID(), "diagnostics of test"));
- mockTask.handle(new TaskEventTAUpdate(mockTask.getLastAttempt().getID(), TaskEventType.T_ATTEMPT_FAILED));
- assertEquals(2, mockTask.getDiagnostics().size());
- assertEquals("TaskAttempt 1 failed, info=[diagnostics of test]", mockTask.getDiagnostics().get(1));
- }
-
- @Test(timeout = 5000)
public void testDiagnostics_KillNew(){
TezTaskID taskId = getNewTaskID();
mockTask.handle(new TaskEventTermination(taskId, TaskAttemptTerminationCause.TERMINATED_BY_CLIENT, null));