[HUDI-288]: Add support for ingesting multiple kafka streams in a single DeltaStreamer deployment (#1150)

* [HUDI-288]: Add support for ingesting multiple kafka streams in a single DeltaStreamer deployment

hudi-hive-sync/src/test/java/org/apache/hudi/hive/TestHiveSyncTool.java

@@ -31,6 +31,7 @@ import org.apache.parquet.schema.PrimitiveType;
 import org.apache.parquet.schema.Types;
 import org.joda.time.DateTime;
 import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -70,6 +71,11 @@ public class TestHiveSyncTool {
     TestUtil.clear();
   }
 
+  @AfterClass
+  public static void cleanUpClass() {
+    TestUtil.shutdown();
+  }
+
   /**
    * Testing converting array types to Hive field declaration strings. According to the Parquet-113 spec:
    * https://github.com/apache/parquet-format/blob/master/LogicalTypes.md#lists

hudi-hive-sync/src/test/java/org/apache/hudi/hive/TestUtil.java

@@ -83,6 +83,7 @@ public class TestUtil {
   private static MiniDFSCluster dfsCluster;
   private static ZooKeeperServer zkServer;
   private static HiveServer2 hiveServer;
+  private static HiveTestService hiveTestService;
   private static Configuration configuration;
   static HiveSyncConfig hiveSyncConfig;
   private static DateTimeFormatter dtfOut;
@@ -100,8 +101,8 @@ public class TestUtil {
       zkServer = zkService.start();
     }
     if (hiveServer == null) {
-      HiveTestService hiveService = new HiveTestService(configuration);
-      hiveServer = hiveService.start();
+      hiveTestService = new HiveTestService(configuration);
+      hiveServer = hiveTestService.start();
     }
     fileSystem = FileSystem.get(configuration);
 
@@ -139,11 +140,13 @@ public class TestUtil {
     return hiveServer.getHiveConf();
   }
 
-  @SuppressWarnings("unused")
   public static void shutdown() {
     if (hiveServer != null) {
       hiveServer.stop();
     }
+    if (hiveTestService != null) {
+      hiveTestService.stop();
+    }
     if (dfsCluster != null) {
       dfsCluster.shutdown();
     }

hudi-hive-sync/src/test/java/org/apache/hudi/hive/util/HiveTestService.java

@@ -121,6 +121,20 @@ public class HiveTestService {
     return hiveServer;
   }
 
+  public void stop() {
+    resetSystemProperties();
+    if (tServer != null) {
+      tServer.stop();
+    }
+    if (hiveServer != null) {
+      hiveServer.stop();
+    }
+    LOG.info("Hive Minicluster service shut down.");
+    tServer = null;
+    hiveServer = null;
+    hadoopConf = null;
+  }
+
   private HiveConf configureHive(Configuration conf, String localHiveLocation) throws IOException {
     conf.set("hive.metastore.local", "false");
     conf.set(HiveConf.ConfVars.METASTOREURIS.varname, "thrift://" + bindIP + ":" + metastorePort);
@@ -183,6 +197,17 @@ public class HiveTestService {
     }
   }
 
+  private void resetSystemProperties() {
+    for (Map.Entry<String, String> entry : sysProps.entrySet()) {
+      if (entry.getValue() != null) {
+        System.setProperty(entry.getKey(), entry.getValue());
+      } else {
+        System.getProperties().remove(entry.getKey());
+      }
+    }
+    sysProps.clear();
+  }
+
   private static String getHiveLocation(String baseLocation) {
     return baseLocation + Path.SEPARATOR + "hive";
   }