Moved 'Application failed' logging

markhamstra · markhamstra · commit b2b7b25af919 · 2014-09-08T11:07:47.000-07:00
diff --git a/core/src/main/scala/org/apache/spark/deploy/master/Master.scala b/core/src/main/scala/org/apache/spark/deploy/master/Master.scala
@@ -312,10 +312,10 @@ private[spark] class Master(
               if (appInfo.incrementRetryCount() < ApplicationState.MAX_NUM_RETRY) {
                 schedule()
               } else {
-                logError(s"Application ${appInfo.desc.name} with ID ${appInfo.id} failed " +
-                  s"${appInfo.retryCount} times; removing it")
                 val execs = idToApp(appId).executors.values
                 if (!execs.exists(_.state == ExecutorState.RUNNING)) {
+                  logError(s"Application ${appInfo.desc.name} with ID ${appInfo.id} failed " +
+                    s"${appInfo.retryCount} times; removing it")
                   removeApplication(appInfo, ApplicationState.FAILED)
                 }
               }

Original file line number	Diff line number	Diff line change
`@@ -312,10 +312,10 @@ private[spark] class Master(`
`312`	`312`	`if (appInfo.incrementRetryCount() < ApplicationState.MAX_NUM_RETRY) {`
`313`	`313`	`schedule()`
`314`	`314`	`} else {`
`315`		`- logError(s"Application ${appInfo.desc.name} with ID ${appInfo.id} failed " +`
`316`		`- s"${appInfo.retryCount} times; removing it")`
`317`	`315`	`val execs = idToApp(appId).executors.values`
`318`	`316`	`if (!execs.exists(_.state == ExecutorState.RUNNING)) {`
	`317`	`+ logError(s"Application ${appInfo.desc.name} with ID ${appInfo.id} failed " +`
	`318`	`+ s"${appInfo.retryCount} times; removing it")`
`319`	`319`	`removeApplication(appInfo, ApplicationState.FAILED)`
`320`	`320`	`}`
`321`	`321`	`}`