Skip to content

Fix flaky spill tests #15875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sopel39 merged 1 commit into from
Jan 27, 2023
Merged

Fix flaky spill tests #15875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion testing/trino-tests/src/test/java/io/trino/memory/TestMemoryManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import static io.trino.spi.StandardErrorCode.CLUSTER_OUT_OF_MEMORY;
import static io.trino.testing.TestingSession.testSessionBuilder;
import static io.trino.testing.assertions.Assert.assertEventually;
import static java.util.UUID.randomUUID;
import static java.util.concurrent.Executors.newCachedThreadPool;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static org.assertj.core.api.Assertions.assertThat;
Expand Down Expand Up @@ -326,7 +327,7 @@ public void testQueryTotalMemoryLimit()
// The user memory enforcement is tested in testQueryTotalMemoryLimit().
// Total memory = user memory + revocable memory.
.put("spill-enabled", "true")
.put("spiller-spill-path", Paths.get(System.getProperty("java.io.tmpdir"), "trino", "spills").toString())
.put("spiller-spill-path", Paths.get(System.getProperty("java.io.tmpdir"), "trino", "spills", randomUUID().toString()).toString())
.put("spiller-max-used-space-threshold", "1.0")
.buildOrThrow();
try (QueryRunner queryRunner = createQueryRunner(SESSION, properties)) {
Expand Down
3 changes: 2 additions & 1 deletion testing/trino-tests/src/test/java/io/trino/tests/TestDistributedSpilledQueries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

import static io.trino.plugin.tpch.TpchMetadata.TINY_SCHEMA_NAME;
import static io.trino.testing.TestingSession.testSessionBuilder;
import static java.util.UUID.randomUUID;
import static org.assertj.core.api.Assertions.assertThat;

public class TestDistributedSpilledQueries
Expand All @@ -49,7 +50,7 @@ public static DistributedQueryRunner createSpillingQueryRunner()
.build();

ImmutableMap<String, String> extraProperties = ImmutableMap.<String, String>builder()
.put("spiller-spill-path", Paths.get(System.getProperty("java.io.tmpdir"), "trino", "spills").toString())
.put("spiller-spill-path", Paths.get(System.getProperty("java.io.tmpdir"), "trino", "spills", randomUUID().toString()).toString())
.put("spiller-max-used-space-threshold", "1.0")
.put("memory-revoking-threshold", "0.0") // revoke always
.put("memory-revoking-target", "0.0")
Expand Down