Do not interrupt reporter thread from within itself.

apache · Aug 26, 2014 · ff389ed · ff389ed
1 parent 3a8ed37
commit ff389ed
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
@@ -129,9 +129,9 @@ private[spark] class ApplicationMaster(args: ApplicationMasterArguments,
         Option(diagnostics).map(msg => s" (diag message: $msg)").getOrElse(""))
       finished = true
       finalStatus = status
-      reporterThread.interrupt()
       try {
         if (Thread.currentThread() != reporterThread) {
+          reporterThread.interrupt()
           reporterThread.join()
         }
       } finally {
@@ -213,12 +213,14 @@ private[spark] class ApplicationMaster(args: ApplicationMasterArguments,
       override def run() {
         while (!finished) {
           checkNumExecutorsFailed()
-          logDebug("Sending progress")
-          allocator.allocateResources()
-          try {
-            Thread.sleep(interval)
-          } catch {
-            case e: InterruptedException =>
+          if (!finished) {
+            logDebug("Sending progress")
+            allocator.allocateResources()
+            try {
+              Thread.sleep(interval)
+            } catch {
+              case e: InterruptedException =>
+            }
           }
         }
       }