[iceberg] branch master updated: Spark: Perform nullability check on metastore and spark instances before invoking stop (#5952)

[pvary]

This is an automated email from the ASF dual-hosted git repository.

pvary pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iceberg.git


The following commit(s) were added to refs/heads/master by this push:
     new ceaddbfa33 Spark: Perform nullability check on metastore and spark 
instances before invoking stop (#5952)
ceaddbfa33 is described below

commit ceaddbfa33fce56f091a8b656e11c9a3cab9b5d0
Author: Sumeet Gajjar <sumeetgajja...@gmail.com>
AuthorDate: Tue Jan 10 01:17:30 2023 -0500

    Spark: Perform nullability check on metastore and spark instances before 
invoking stop (#5952)
---
 .../test/java/org/apache/iceberg/spark/SparkTestBase.java  | 12 ++++++++----
 .../test/java/org/apache/iceberg/spark/SparkTestBase.java  | 12 ++++++++----
 .../test/java/org/apache/iceberg/spark/SparkTestBase.java  | 12 ++++++++----
 .../test/java/org/apache/iceberg/spark/SparkTestBase.java  | 14 +++++++++-----
 4 files changed, 33 insertions(+), 17 deletions(-)

diff --git 
a/spark/v2.4/spark/src/test/java/org/apache/iceberg/spark/SparkTestBase.java 
b/spark/v2.4/spark/src/test/java/org/apache/iceberg/spark/SparkTestBase.java
index 95fc7e1bb7..f2d3bd0b07 100644
--- a/spark/v2.4/spark/src/test/java/org/apache/iceberg/spark/SparkTestBase.java
+++ b/spark/v2.4/spark/src/test/java/org/apache/iceberg/spark/SparkTestBase.java
@@ -79,10 +79,14 @@ public abstract class SparkTestBase {
   @AfterClass
   public static void stopMetastoreAndSpark() throws Exception {
     SparkTestBase.catalog = null;
-    metastore.stop();
-    SparkTestBase.metastore = null;
-    spark.stop();
-    SparkTestBase.spark = null;
+    if (metastore != null) {
+      metastore.stop();
+      SparkTestBase.metastore = null;
+    }
+    if (spark != null) {
+      spark.stop();
+      SparkTestBase.spark = null;
+    }
   }
 
   protected long waitUntilAfter(long timestampMillis) {
diff --git 
a/spark/v3.1/spark/src/test/java/org/apache/iceberg/spark/SparkTestBase.java 
b/spark/v3.1/spark/src/test/java/org/apache/iceberg/spark/SparkTestBase.java
index 9db0d6d410..7f6028596f 100644
--- a/spark/v3.1/spark/src/test/java/org/apache/iceberg/spark/SparkTestBase.java
+++ b/spark/v3.1/spark/src/test/java/org/apache/iceberg/spark/SparkTestBase.java
@@ -85,10 +85,14 @@ public abstract class SparkTestBase {
   @AfterClass
   public static void stopMetastoreAndSpark() throws Exception {
     SparkTestBase.catalog = null;
-    metastore.stop();
-    SparkTestBase.metastore = null;
-    spark.stop();
-    SparkTestBase.spark = null;
+    if (metastore != null) {
+      metastore.stop();
+      SparkTestBase.metastore = null;
+    }
+    if (spark != null) {
+      spark.stop();
+      SparkTestBase.spark = null;
+    }
   }
 
   protected long waitUntilAfter(long timestampMillis) {
diff --git 
a/spark/v3.2/spark/src/test/java/org/apache/iceberg/spark/SparkTestBase.java 
b/spark/v3.2/spark/src/test/java/org/apache/iceberg/spark/SparkTestBase.java
index 95b145ae76..ed11a59772 100644
--- a/spark/v3.2/spark/src/test/java/org/apache/iceberg/spark/SparkTestBase.java
+++ b/spark/v3.2/spark/src/test/java/org/apache/iceberg/spark/SparkTestBase.java
@@ -84,10 +84,14 @@ public abstract class SparkTestBase extends 
SparkTestHelperBase {
   @AfterClass
   public static void stopMetastoreAndSpark() throws Exception {
     SparkTestBase.catalog = null;
-    metastore.stop();
-    SparkTestBase.metastore = null;
-    spark.stop();
-    SparkTestBase.spark = null;
+    if (metastore != null) {
+      metastore.stop();
+      SparkTestBase.metastore = null;
+    }
+    if (spark != null) {
+      spark.stop();
+      SparkTestBase.spark = null;
+    }
   }
 
   protected long waitUntilAfter(long timestampMillis) {
diff --git 
a/spark/v3.3/spark/src/test/java/org/apache/iceberg/spark/SparkTestBase.java 
b/spark/v3.3/spark/src/test/java/org/apache/iceberg/spark/SparkTestBase.java
index 91a9150aa5..82b3652899 100644
--- a/spark/v3.3/spark/src/test/java/org/apache/iceberg/spark/SparkTestBase.java
+++ b/spark/v3.3/spark/src/test/java/org/apache/iceberg/spark/SparkTestBase.java
@@ -97,11 +97,15 @@ public abstract class SparkTestBase extends 
SparkTestHelperBase {
   @AfterClass
   public static void stopMetastoreAndSpark() throws Exception {
     SparkTestBase.catalog = null;
-    metastore.stop();
-    SparkTestBase.metastore = null;
-    spark.stop();
-    SparkTestBase.spark = null;
-    SparkTestBase.sparkContext = null;
+    if (metastore != null) {
+      metastore.stop();
+      SparkTestBase.metastore = null;
+    }
+    if (spark != null) {
+      spark.stop();
+      SparkTestBase.spark = null;
+      SparkTestBase.sparkContext = null;
+    }
   }
 
   protected long waitUntilAfter(long timestampMillis) {