From a7c0e2a7c3a9ae223a8b8b6bc952ac6c51a6dbab Mon Sep 17 00:00:00 2001
From: Matei Zaharia <matei@eecs.berkeley.edu>
Date: Wed, 29 Sep 2010 00:22:11 -0700
Subject: [PATCH] Made task-finished log messages slightly nicer

---
 src/scala/spark/MesosScheduler.scala | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/scala/spark/MesosScheduler.scala b/src/scala/spark/MesosScheduler.scala
index be58957806..6075019b8d 100644
--- a/src/scala/spark/MesosScheduler.scala
+++ b/src/scala/spark/MesosScheduler.scala
@@ -299,9 +299,11 @@ extends ParallelOperation with Logging
 
   def taskFinished(status: TaskStatus) {
     val tid = status.getTaskId
-    logInfo("Finished opId " + opId + " TID " + tid)
     val index = tidToIndex(tid)
     if (!finished(index)) {
+      tasksFinished += 1
+      logInfo("Finished opId %d TID %d (progress: %d/%d)".format(
+        opId, tid, tasksFinished, numTasks))
       // Deserialize task result
       val result = Utils.deserialize[TaskResult[T]](status.getData)
       results(index) = result.value
@@ -311,25 +313,25 @@ extends ParallelOperation with Logging
       finished(index) = true
       // Remove TID -> opId mapping from sched
       sched.taskIdToOpId.remove(tid)
-      tasksFinished += 1
-      logInfo("Progress: " + tasksFinished + "/" + numTasks)
       if (tasksFinished == numTasks)
         setAllFinished()
     } else {
-      logInfo("Task " + index + " has already finished, so ignoring it")
+      logInfo("Ignoring task-finished event for TID " + tid +
+        " because task " + index + " is already finished")
     }
   }
 
   def taskLost(status: TaskStatus) {
     val tid = status.getTaskId
-    logInfo("Lost opId " + opId + " TID " + tid)
     val index = tidToIndex(tid)
     if (!finished(index)) {
+      logInfo("Lost opId " + opId + " TID " + tid)
       launched(index) = false
       sched.taskIdToOpId.remove(tid)
       tasksLaunched -= 1
     } else {
-      logInfo("Task " + index + " has already finished, so ignoring it")
+      logInfo("Ignoring task-lost event for TID " + tid +
+        " because task " + index + " is already finished")
     }
   }
 
-- 
GitLab