Repository: spark
Updated Branches:
  refs/heads/branch-1.6 765307f41 -> 1fcd17f84


[SPARK-13901][CORE] correct the logDebug information when jump to the next 
locality level

JIRA Issue:https://issues.apache.org/jira/browse/SPARK-13901
In getAllowedLocalityLevel method of TaskSetManager,we get wrong logDebug 
information when jump to the next locality level.So we should fix it.

Author: trueyao <[email protected]>

Closes #11719 from trueyao/logDebug-localityWait.

(cherry picked from commit ea9ca6f04ce1fb83612f907d6d0996d6fb362bd2)
Signed-off-by: Sean Owen <[email protected]>


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1fcd17f8
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1fcd17f8
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1fcd17f8

Branch: refs/heads/branch-1.6
Commit: 1fcd17f84ac497caaf1540f6fa5f32f23b93e657
Parents: 765307f
Author: trueyao <[email protected]>
Authored: Thu Mar 17 09:45:06 2016 +0000
Committer: Sean Owen <[email protected]>
Committed: Thu Mar 17 09:45:15 2016 +0000

----------------------------------------------------------------------
 .../main/scala/org/apache/spark/scheduler/TaskSetManager.scala   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/1fcd17f8/core/src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala
----------------------------------------------------------------------
diff --git 
a/core/src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala 
b/core/src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala
index c0f4351..832eef3 100644
--- a/core/src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala
+++ b/core/src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala
@@ -555,9 +555,9 @@ private[spark] class TaskSetManager(
         // Jump to the next locality level, and reset lastLaunchTime so that 
the next locality
         // wait timer doesn't immediately expire
         lastLaunchTime += localityWaits(currentLocalityIndex)
-        currentLocalityIndex += 1
-        logDebug(s"Moving to ${myLocalityLevels(currentLocalityIndex)} after 
waiting for " +
+        logDebug(s"Moving to ${myLocalityLevels(currentLocalityIndex + 1)} 
after waiting for " +
           s"${localityWaits(currentLocalityIndex)}ms")
+        currentLocalityIndex += 1
       } else {
         return myLocalityLevels(currentLocalityIndex)
       }


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to