From 1d767967e925f1d727957c2d43383ef6ad2c5d5e Mon Sep 17 00:00:00 2001
From: Sandy Ryza <sandy@cloudera.com>
Date: Fri, 12 Sep 2014 16:48:28 -0500
Subject: [PATCH] SPARK-3014. Log a more informative messages in a couple
failure scenario...
...s
Author: Sandy Ryza <sandy@cloudera.com>
Closes #1934 from sryza/sandy-spark-3014 and squashes the following commits:
ae19cc1 [Sandy Ryza] SPARK-3014. Log a more informative messages in a couple failure scenarios
---
.../main/scala/org/apache/spark/deploy/SparkSubmit.scala | 6 ++++--
.../org/apache/spark/deploy/yarn/ApplicationMaster.scala | 6 ++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala b/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala
index 0fdb5ae3c2..5ed3575816 100644
--- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala
@@ -18,7 +18,7 @@
package org.apache.spark.deploy
import java.io.{File, PrintStream}
-import java.lang.reflect.InvocationTargetException
+import java.lang.reflect.{Modifier, InvocationTargetException}
import java.net.URL
import scala.collection.mutable.{ArrayBuffer, HashMap, Map}
@@ -323,7 +323,9 @@ object SparkSubmit {
}
val mainMethod = mainClass.getMethod("main", new Array[String](0).getClass)
-
+ if (!Modifier.isStatic(mainMethod.getModifiers)) {
+ throw new IllegalStateException("The main method in the given main class must be static")
+ }
try {
mainMethod.invoke(null, childArgs.toArray)
} catch {
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
index 878b6db546..735d7723b0 100644
--- 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
@@ -283,11 +283,9 @@ private[spark] class ApplicationMaster(args: ApplicationMasterArguments,
}
val sparkContext = sparkContextRef.get()
- assert(sparkContext != null || count >= numTries)
if (sparkContext == null) {
- logError(
- "Unable to retrieve sparkContext inspite of waiting for %d, numTries = %d".format(
- count * waitTime, numTries))
+ logError(("SparkContext did not initialize after waiting for %d ms. Please check earlier"
+ + " log output for errors. Failing the application.").format(numTries * waitTime))
}
sparkContext
}
--
GitLab