From 6b2d33cad7dcf63bfaae3328dc3121eeed26c9cd Mon Sep 17 00:00:00 2001 From: SaurabhChawla Date: Tue, 9 Jun 2020 15:17:01 +0530 Subject: [PATCH 1/5] Add the code change to handle the SparkException --- core/src/main/scala/org/apache/spark/ui/SparkUI.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/main/scala/org/apache/spark/ui/SparkUI.scala b/core/src/main/scala/org/apache/spark/ui/SparkUI.scala index 8ae9828c3fee1..268b443728afd 100644 --- a/core/src/main/scala/org/apache/spark/ui/SparkUI.scala +++ b/core/src/main/scala/org/apache/spark/ui/SparkUI.scala @@ -19,7 +19,7 @@ package org.apache.spark.ui import java.util.Date -import org.apache.spark.{SecurityManager, SparkConf, SparkContext} +import org.apache.spark.{SecurityManager, SparkConf, SparkContext, SparkException} import org.apache.spark.internal.Logging import org.apache.spark.internal.config.UI._ import org.apache.spark.scheduler._ @@ -87,6 +87,7 @@ private[spark] class SparkUI private ( .getOrElse("") } catch { case _: NoSuchElementException => "" + case _: SparkException => "" } } From 2b55c246cd2abb35dad615f9c34e7b1507b491a4 Mon Sep 17 00:00:00 2001 From: SaurabhChawla Date: Tue, 9 Jun 2020 15:27:13 +0530 Subject: [PATCH 2/5] Add the code change to handle the SparkException --- core/src/main/scala/org/apache/spark/ui/SparkUI.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/scala/org/apache/spark/ui/SparkUI.scala b/core/src/main/scala/org/apache/spark/ui/SparkUI.scala index 268b443728afd..6ca8d36335abd 100644 --- a/core/src/main/scala/org/apache/spark/ui/SparkUI.scala +++ b/core/src/main/scala/org/apache/spark/ui/SparkUI.scala @@ -86,8 +86,8 @@ private[spark] class SparkUI private ( .orElse(store.environmentInfo().systemProperties.toMap.get("user.name")) .getOrElse("") } catch { + case sparkException: SparkException => "" case _: NoSuchElementException => "" - case _: SparkException => "" } } From b75d168d3fc350f8da5f19859aba463d16be9d67 Mon Sep 17 00:00:00 2001 From: SaurabhChawla Date: Tue, 9 Jun 2020 16:38:05 +0530 Subject: [PATCH 3/5] Add the code change as per the review comments --- core/src/main/scala/org/apache/spark/ui/SparkUI.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/scala/org/apache/spark/ui/SparkUI.scala b/core/src/main/scala/org/apache/spark/ui/SparkUI.scala index 6ca8d36335abd..5310ee265fd43 100644 --- a/core/src/main/scala/org/apache/spark/ui/SparkUI.scala +++ b/core/src/main/scala/org/apache/spark/ui/SparkUI.scala @@ -86,7 +86,7 @@ private[spark] class SparkUI private ( .orElse(store.environmentInfo().systemProperties.toMap.get("user.name")) .getOrElse("") } catch { - case sparkException: SparkException => "" + case _: SparkException => "" case _: NoSuchElementException => "" } } From 99584f5b2f7ac7729f4d2f383dc63bbc3f9dd614 Mon Sep 17 00:00:00 2001 From: SaurabhChawla Date: Tue, 9 Jun 2020 16:51:10 +0530 Subject: [PATCH 4/5] removed NoSuchElementException as SparkException is extending exception and it can handle this --- core/src/main/scala/org/apache/spark/ui/SparkUI.scala | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/main/scala/org/apache/spark/ui/SparkUI.scala b/core/src/main/scala/org/apache/spark/ui/SparkUI.scala index 5310ee265fd43..e6703ac25ee83 100644 --- a/core/src/main/scala/org/apache/spark/ui/SparkUI.scala +++ b/core/src/main/scala/org/apache/spark/ui/SparkUI.scala @@ -87,7 +87,6 @@ private[spark] class SparkUI private ( .getOrElse("") } catch { case _: SparkException => "" - case _: NoSuchElementException => "" } } From e8769fbc8c46554a48da617d6b1207fa989f6b95 Mon Sep 17 00:00:00 2001 From: SaurabhChawla Date: Tue, 9 Jun 2020 21:37:23 +0530 Subject: [PATCH 5/5] throwing NoSuchElementException instead of SparkException --- .../main/scala/org/apache/spark/status/AppStatusStore.scala | 2 +- core/src/main/scala/org/apache/spark/ui/SparkUI.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/status/AppStatusStore.scala b/core/src/main/scala/org/apache/spark/status/AppStatusStore.scala index ea033d0c890ac..bd19c9522f3df 100644 --- a/core/src/main/scala/org/apache/spark/status/AppStatusStore.scala +++ b/core/src/main/scala/org/apache/spark/status/AppStatusStore.scala @@ -42,7 +42,7 @@ private[spark] class AppStatusStore( store.view(classOf[ApplicationInfoWrapper]).max(1).iterator().next().info } catch { case _: NoSuchElementException => - throw new SparkException("Failed to get the application information. " + + throw new NoSuchElementException("Failed to get the application information. " + "If you are starting up Spark, please wait a while until it's ready.") } } diff --git a/core/src/main/scala/org/apache/spark/ui/SparkUI.scala b/core/src/main/scala/org/apache/spark/ui/SparkUI.scala index e6703ac25ee83..8ae9828c3fee1 100644 --- a/core/src/main/scala/org/apache/spark/ui/SparkUI.scala +++ b/core/src/main/scala/org/apache/spark/ui/SparkUI.scala @@ -19,7 +19,7 @@ package org.apache.spark.ui import java.util.Date -import org.apache.spark.{SecurityManager, SparkConf, SparkContext, SparkException} +import org.apache.spark.{SecurityManager, SparkConf, SparkContext} import org.apache.spark.internal.Logging import org.apache.spark.internal.config.UI._ import org.apache.spark.scheduler._ @@ -86,7 +86,7 @@ private[spark] class SparkUI private ( .orElse(store.environmentInfo().systemProperties.toMap.get("user.name")) .getOrElse("") } catch { - case _: SparkException => "" + case _: NoSuchElementException => "" } }