Properly close Glue metastore in tests

Fix thread leak during tests' execution.

plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/BaseDeltaLakeSharedMetastoreViewsTest.java

@@ -17,6 +17,7 @@
 import io.trino.plugin.deltalake.metastore.TestingDeltaLakeMetastoreModule;
 import io.trino.plugin.hive.TestingHivePlugin;
 import io.trino.plugin.hive.metastore.HiveMetastore;
+import io.trino.plugin.hive.metastore.glue.GlueHiveMetastore;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
@@ -175,6 +176,9 @@ public void cleanup()
     {
         if (metastore != null) {
             metastore.dropDatabase(SCHEMA, false);
+            if (metastore instanceof GlueHiveMetastore glueMetastore) {
+                glueMetastore.shutdown();
+            }
             deleteRecursively(dataDirectory, ALLOW_INSECURE);
         }
     }

plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeSharedGlueMetastoreWithTableRedirections.java

@@ -16,7 +16,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.trino.Session;
 import io.trino.plugin.hive.TestingHivePlugin;
-import io.trino.plugin.hive.metastore.HiveMetastore;
+import io.trino.plugin.hive.metastore.glue.GlueHiveMetastore;
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
 import org.junit.jupiter.api.AfterAll;
@@ -40,7 +40,7 @@ public class TestDeltaLakeSharedGlueMetastoreWithTableRedirections
         extends BaseDeltaLakeSharedMetastoreWithTableRedirectionsTest
 {
     private Path dataDirectory;
-    private HiveMetastore glueMetastore;
+    private GlueHiveMetastore glueMetastore;
 
     @Override
     protected QueryRunner createQueryRunner()
@@ -84,6 +84,7 @@ public void cleanup()
     {
         // Data is on the local disk and will be deleted by the deleteOnExit hook
         glueMetastore.dropDatabase(schema, false);
+        glueMetastore.shutdown();
     }
 
     @Override

plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeTableWithCustomLocationUsingGlueMetastore.java

@@ -55,5 +55,6 @@ public void tearDown()
     {
         // Data is on the local disk and will be deleted by query runner cleanup
         metastore.dropDatabase(schema, false);
+        metastore.shutdown();
     }
 }

plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeConcurrentModificationGlueMetastore.java

@@ -125,6 +125,7 @@ public void cleanup()
     {
         if (metastore != null) {
             metastore.dropDatabase(SCHEMA, false);
+            metastore.shutdown();
             deleteRecursively(dataDirectory, ALLOW_INSECURE);
         }
     }

plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeRegisterTableProcedureWithGlue.java

@@ -56,5 +56,6 @@ public void tearDown()
     {
         // Data is on the local disk and will be deleted by query runner cleanup
         metastore.dropDatabase(schema, false);
+        metastore.shutdown();
     }
 }

plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeViewsGlueMetastore.java

@@ -14,7 +14,7 @@
 package io.trino.plugin.deltalake.metastore.glue;
 
 import io.trino.plugin.deltalake.DeltaLakeQueryRunner;
-import io.trino.plugin.hive.metastore.HiveMetastore;
+import io.trino.plugin.hive.metastore.glue.GlueHiveMetastore;
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.QueryRunner;
 import io.trino.testing.sql.TestTable;
@@ -39,7 +39,7 @@
 public class TestDeltaLakeViewsGlueMetastore
         extends AbstractTestQueryFramework
 {
-    private HiveMetastore metastore;
+    private GlueHiveMetastore metastore;
     private String schema;
 
     @Override
@@ -62,6 +62,7 @@ public void cleanup()
             throws IOException
     {
         metastore.dropDatabase(schema, false);
+        metastore.shutdown();
     }
 
     @Test

plugin/trino-hive/src/test/java/io/trino/plugin/hive/BaseS3AndGlueMetastoreTest.java

@@ -15,7 +15,7 @@
 
 import io.trino.Session;
 import io.trino.plugin.base.util.UncheckedCloseable;
-import io.trino.plugin.hive.metastore.HiveMetastore;
+import io.trino.plugin.hive.metastore.glue.GlueHiveMetastore;
 import io.trino.spi.connector.SchemaNotFoundException;
 import io.trino.testing.AbstractTestQueryFramework;
 import org.intellij.lang.annotations.Language;
@@ -54,7 +54,7 @@ public abstract class BaseS3AndGlueMetastoreTest
     protected final String bucketName;
     protected final String schemaName = "test_glue_s3_" + randomNameSuffix();
 
-    protected HiveMetastore metastore;
+    protected GlueHiveMetastore metastore;
     protected S3Client s3;
 
     protected BaseS3AndGlueMetastoreTest(String partitionByKeyword, String locationKeyword, String bucketName)
@@ -75,6 +75,7 @@ public void tearDown()
     {
         if (metastore != null) {
             metastore.dropDatabase(schemaName, true);
+            metastore.shutdown();
             metastore = null;
         }
         if (s3 != null) {

plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveConcurrentModificationGlueMetastore.java

@@ -142,6 +142,7 @@ public void cleanup()
     {
         if (metastore != null) {
             metastore.dropDatabase(SCHEMA, false);
+            metastore.shutdown();
             deleteRecursively(dataDirectory, ALLOW_INSECURE);
         }
     }

plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/TestGlueHiveMetastore.java

@@ -13,6 +13,7 @@
  */
 package io.trino.plugin.hive.metastore;
 
+import io.trino.plugin.hive.metastore.glue.GlueHiveMetastore;
 import org.junit.jupiter.api.AfterAll;
 
 import java.io.IOException;
@@ -27,7 +28,7 @@ final class TestGlueHiveMetastore
         extends AbstractTestHiveMetastore
 {
     private final Path tempDir;
-    private final HiveMetastore metastore;
+    private final GlueHiveMetastore metastore;
 
     TestGlueHiveMetastore()
             throws IOException
@@ -40,6 +41,7 @@ final class TestGlueHiveMetastore
     void tearDown()
             throws IOException
     {
+        metastore.shutdown();
         deleteRecursively(tempDir, ALLOW_INSECURE);
     }
 

plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueTableOperationsInsertFailure.java

@@ -19,7 +19,7 @@
 import io.trino.Session;
 import io.trino.execution.Failure;
 import io.trino.plugin.hive.metastore.Database;
-import io.trino.plugin.hive.metastore.HiveMetastore;
+import io.trino.plugin.hive.metastore.glue.GlueHiveMetastore;
 import io.trino.plugin.iceberg.TestingIcebergPlugin;
 import io.trino.spi.security.PrincipalType;
 import io.trino.testing.AbstractTestQueryFramework;
@@ -59,7 +59,7 @@ public class TestIcebergGlueTableOperationsInsertFailure
 
     private final String schemaName = "test_iceberg_glue_" + randomNameSuffix();
 
-    private HiveMetastore glueHiveMetastore;
+    private GlueHiveMetastore glueHiveMetastore;
 
     @Override
     protected QueryRunner createQueryRunner()
@@ -111,6 +111,7 @@ public void cleanup()
             if (glueHiveMetastore != null) {
                 // Data is on the local disk and will be deleted by the deleteOnExit hook
                 glueHiveMetastore.dropDatabase(schemaName, false);
+                glueHiveMetastore.shutdown();
             }
         }
         catch (Exception e) {

plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestSharedGlueMetastore.java

@@ -18,7 +18,7 @@
 import io.airlift.log.Logger;
 import io.trino.Session;
 import io.trino.plugin.hive.TestingHivePlugin;
-import io.trino.plugin.hive.metastore.HiveMetastore;
+import io.trino.plugin.hive.metastore.glue.GlueHiveMetastore;
 import io.trino.plugin.iceberg.BaseSharedMetastoreTest;
 import io.trino.plugin.iceberg.IcebergPlugin;
 import io.trino.plugin.tpch.TpchPlugin;
@@ -55,7 +55,7 @@ public class TestSharedGlueMetastore
     private static final String HIVE_CATALOG = "hive";
 
     private Path dataDirectory;
-    private HiveMetastore glueMetastore;
+    private GlueHiveMetastore glueMetastore;
 
     @Override
     protected QueryRunner createQueryRunner()
@@ -115,6 +115,7 @@ public void cleanup()
             if (glueMetastore != null) {
                 // Data is on the local disk and will be deleted by the deleteOnExit hook
                 glueMetastore.dropDatabase(schema, false);
+                glueMetastore.shutdown();
             }
         }
         catch (Exception e) {