Use separate directory for raptor data

There is a race condition between shard cleaner and query runner cleanup when baseDir is used
trinodb · Mar 22, 2024 · 51eea3a · 51eea3a
1 parent d5d4cc8
commit 51eea3a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/...in/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/RaptorQueryRunner.java b/...in/trino-raptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/RaptorQueryRunner.java
@@ -31,7 +31,9 @@
 import io.trino.tpch.TpchTable;
 import org.intellij.lang.annotations.Language;
 
-import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -64,15 +66,14 @@ public static QueryRunner createRaptorQueryRunner(
         queryRunner.createCatalog("tpch", "tpch");
 
         queryRunner.installPlugin(new RaptorPlugin());
-        File baseDir = queryRunner.getCoordinator().getBaseDataDir().toFile();
         Map<String, String> raptorProperties = ImmutableMap.<String, String>builder()
                 .putAll(extraRaptorProperties)
                 .put("metadata.db.type", "h2")
-                .put("metadata.db.filename", new File(baseDir, "db").getAbsolutePath())
-                .put("storage.data-directory", new File(baseDir, "data").getAbsolutePath())
+                .put("metadata.db.filename", createTempDirectory("raptor-db").toString())
+                .put("storage.data-directory", createTempDirectory("raptor-data").toString())
                 .put("storage.max-shard-rows", "2000")
                 .put("backup.provider", "file")
-                .put("backup.directory", new File(baseDir, "backup").getAbsolutePath())
+                .put("backup.directory", createTempDirectory("raptor-backup").toString())
                 .buildOrThrow();
 
         queryRunner.createCatalog("raptor", "raptor_legacy", raptorProperties);
@@ -163,6 +164,14 @@ public static Session createSession(String schema)
                 .build();
     }
 
+    public static Path createTempDirectory(String name)
+            throws IOException
+    {
+        Path tempDirectory = Files.createTempDirectory(name);
+        tempDirectory.toFile().deleteOnExit();
+        return tempDirectory.toAbsolutePath();
+    }
+
     public static void main(String[] args)
             throws Exception
     {

diff --git a/...ptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/TestRaptorMySqlConnectorTest.java b/...ptor-legacy/src/test/java/io/trino/plugin/raptor/legacy/TestRaptorMySqlConnectorTest.java
@@ -18,18 +18,15 @@
 import io.trino.testing.DistributedQueryRunner;
 import io.trino.testing.QueryRunner;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.TestInstance;
 import org.testcontainers.containers.MySQLContainer;
 
-import java.io.File;
 import java.util.Map;
 
 import static io.trino.plugin.raptor.legacy.RaptorQueryRunner.copyTables;
 import static io.trino.plugin.raptor.legacy.RaptorQueryRunner.createSession;
+import static io.trino.plugin.raptor.legacy.RaptorQueryRunner.createTempDirectory;
 import static java.lang.String.format;
-import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
-@TestInstance(PER_CLASS)
 public class TestRaptorMySqlConnectorTest
         extends BaseRaptorConnectorTest
 {
@@ -68,15 +65,14 @@ private static QueryRunner createRaptorMySqlQueryRunner(String mysqlUrl)
         queryRunner.createCatalog("tpch", "tpch");
 
         queryRunner.installPlugin(new RaptorPlugin());
-        File baseDir = queryRunner.getCoordinator().getBaseDataDir().toFile();
         Map<String, String> raptorProperties = ImmutableMap.<String, String>builder()
                 .put("metadata.db.type", "mysql")
                 .put("metadata.db.url", mysqlUrl)
                 .put("storage.compaction-enabled", "false")
-                .put("storage.data-directory", new File(baseDir, "data").getAbsolutePath())
+                .put("storage.data-directory", createTempDirectory("raptor-db").toString())
                 .put("storage.max-shard-rows", "2000")
                 .put("backup.provider", "file")
-                .put("backup.directory", new File(baseDir, "backup").getAbsolutePath())
+                .put("backup.directory", createTempDirectory("raptor-db").toString())
                 .buildOrThrow();
 
         queryRunner.createCatalog("raptor", "raptor_legacy", raptorProperties);