Skip to content
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

Jump to bottom

Fix potential resource leak in TestScaledWriterScheduler #21924

Merged
merged 1 commit into from
May 11, 2024
Merged

Fix potential resource leak in TestScaledWriterScheduler #21924

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
59 changes: 33 additions & 26 deletions core/trino-main/src/test/java/io/trino/execution/scheduler/TestScaledWriterScheduler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,9 @@ public void testGetNewTaskCountWithUnderutilizedTasksWithoutSkewness()
TaskStatus taskStatus2 = buildTaskStatus(false, 12345L);
TaskStatus taskStatus3 = buildTaskStatus(false, 12345L);

ScaledWriterScheduler scaledWriterScheduler = buildScaleWriterSchedulerWithInitialTasks(taskStatus1, taskStatus2, taskStatus3);
assertThat(scaledWriterScheduler.schedule().getNewTasks().size()).isEqualTo(0);
try (ScaledWriterScheduler scaledWriterScheduler = buildScaleWriterSchedulerWithInitialTasks(taskStatus1, taskStatus2, taskStatus3)) {
assertThat(scaledWriterScheduler.schedule().getNewTasks().size()).isEqualTo(0);
}
}

@Test
Expand All @@ -87,8 +88,9 @@ public void testGetNewTaskCountWithOverutilizedTasksWithoutSkewness()
TaskStatus taskStatus2 = buildTaskStatus(true, 12345L);
TaskStatus taskStatus3 = buildTaskStatus(false, 12345L);

ScaledWriterScheduler scaledWriterScheduler = buildScaleWriterSchedulerWithInitialTasks(taskStatus1, taskStatus2, taskStatus3);
assertThat(scaledWriterScheduler.schedule().getNewTasks().size()).isEqualTo(1);
try (ScaledWriterScheduler scaledWriterScheduler = buildScaleWriterSchedulerWithInitialTasks(taskStatus1, taskStatus2, taskStatus3)) {
assertThat(scaledWriterScheduler.schedule().getNewTasks().size()).isEqualTo(1);
}
}

@Test
Expand All @@ -98,8 +100,9 @@ public void testGetNewTaskCountWithOverutilizedSkewedTaskAndUnderutilizedNonSkew
TaskStatus taskStatus2 = buildTaskStatus(false, 12345L);
TaskStatus taskStatus3 = buildTaskStatus(false, 123456L);

ScaledWriterScheduler scaledWriterScheduler = buildScaleWriterSchedulerWithInitialTasks(taskStatus1, taskStatus2, taskStatus3);
assertThat(scaledWriterScheduler.schedule().getNewTasks().size()).isEqualTo(1);
try (ScaledWriterScheduler scaledWriterScheduler = buildScaleWriterSchedulerWithInitialTasks(taskStatus1, taskStatus2, taskStatus3)) {
assertThat(scaledWriterScheduler.schedule().getNewTasks().size()).isEqualTo(1);
}
}

@Test
Expand All @@ -109,8 +112,9 @@ public void testGetNewTaskCountWithUnderutilizedSkewedTaskAndOverutilizedNonSkew
TaskStatus taskStatus2 = buildTaskStatus(true, 123456L);
TaskStatus taskStatus3 = buildTaskStatus(false, 1234567L);

ScaledWriterScheduler scaledWriterScheduler = buildScaleWriterSchedulerWithInitialTasks(taskStatus1, taskStatus2, taskStatus3);
assertThat(scaledWriterScheduler.schedule().getNewTasks().size()).isEqualTo(1);
try (ScaledWriterScheduler scaledWriterScheduler = buildScaleWriterSchedulerWithInitialTasks(taskStatus1, taskStatus2, taskStatus3)) {
assertThat(scaledWriterScheduler.schedule().getNewTasks().size()).isEqualTo(1);
}
}

@Test
Expand All @@ -120,9 +124,10 @@ public void testGetNewTaskCountWhenWriterDataProcessedIsGreaterThanMinForScaleUp
TaskStatus taskStatus2 = buildTaskStatus(1, DataSize.of(32, DataSize.Unit.MEGABYTE));
TaskStatus taskStatus3 = buildTaskStatus(2, DataSize.of(64, DataSize.Unit.MEGABYTE));

ScaledWriterScheduler scaledWriterScheduler = buildScaleWriterSchedulerWithInitialTasks(taskStatus1, taskStatus2, taskStatus3);
// Scale up will happen
assertThat(scaledWriterScheduler.schedule().getNewTasks().size()).isEqualTo(1);
try (ScaledWriterScheduler scaledWriterScheduler = buildScaleWriterSchedulerWithInitialTasks(taskStatus1, taskStatus2, taskStatus3)) {
// Scale up will happen
assertThat(scaledWriterScheduler.schedule().getNewTasks().size()).isEqualTo(1);
}
}

@Test
Expand All @@ -132,10 +137,11 @@ public void testGetNewTaskCountWhenWriterDataProcessedIsLessThanMinForScaleUp()
TaskStatus taskStatus2 = buildTaskStatus(1, DataSize.of(32, DataSize.Unit.MEGABYTE));
TaskStatus taskStatus3 = buildTaskStatus(2, DataSize.of(32, DataSize.Unit.MEGABYTE));

ScaledWriterScheduler scaledWriterScheduler = buildScaleWriterSchedulerWithInitialTasks(taskStatus1, taskStatus2, taskStatus3);
// Scale up will not happen because for one of the task there are two local writers which makes the
// minWrittenBytes for scaling up to (2 * writerScalingMinDataProcessed) that is greater than writerInputDataSize.
assertThat(scaledWriterScheduler.schedule().getNewTasks().size()).isEqualTo(0);
try (ScaledWriterScheduler scaledWriterScheduler = buildScaleWriterSchedulerWithInitialTasks(taskStatus1, taskStatus2, taskStatus3)) {
// Scale up will not happen because for one of the task there are two local writers which makes the
// minWrittenBytes for scaling up to (2 * writerScalingMinDataProcessed) that is greater than writerInputDataSize.
assertThat(scaledWriterScheduler.schedule().getNewTasks().size()).isEqualTo(0);
}
}

@Test
Expand All @@ -145,31 +151,32 @@ public void testGetNewTaskCountWhenExistingWriterTaskMaxWriterCountIsEmpty()
TaskStatus taskStatus2 = buildTaskStatus(2, DataSize.of(100, DataSize.Unit.MEGABYTE));
TaskStatus taskStatus3 = buildTaskStatus(true, 12345L, Optional.empty(), DataSize.of(0, DataSize.Unit.MEGABYTE));

ScaledWriterScheduler scaledWriterScheduler = buildScaleWriterSchedulerWithInitialTasks(taskStatus1, taskStatus2, taskStatus3);
// Scale up will not happen because one of the existing writer task isn't initialized yet with maxWriterCount.
assertThat(scaledWriterScheduler.schedule().getNewTasks().size()).isEqualTo(0);
try (ScaledWriterScheduler scaledWriterScheduler = buildScaleWriterSchedulerWithInitialTasks(taskStatus1, taskStatus2, taskStatus3)) {
// Scale up will not happen because one of the existing writer task isn't initialized yet with maxWriterCount.
assertThat(scaledWriterScheduler.schedule().getNewTasks().size()).isEqualTo(0);
}
}

@Test
public void testNewTaskCountWhenNodesUpperLimitIsNotExceeded()
{
TaskStatus taskStatus = buildTaskStatus(true, 123456L);
AtomicReference<List<TaskStatus>> taskStatusProvider = new AtomicReference<>(ImmutableList.of(taskStatus));
ScaledWriterScheduler scaledWriterScheduler = buildScaledWriterScheduler(taskStatusProvider, 2);

scaledWriterScheduler.schedule();
assertThat(scaledWriterScheduler.schedule().getNewTasks().size()).isEqualTo(1);
try (ScaledWriterScheduler scaledWriterScheduler = buildScaledWriterScheduler(taskStatusProvider, 2)) {
scaledWriterScheduler.schedule();
assertThat(scaledWriterScheduler.schedule().getNewTasks().size()).isEqualTo(1);
}
}

@Test
public void testNewTaskCountWhenNodesUpperLimitIsExceeded()
{
TaskStatus taskStatus = buildTaskStatus(true, 123456L);
AtomicReference<List<TaskStatus>> taskStatusProvider = new AtomicReference<>(ImmutableList.of(taskStatus));
ScaledWriterScheduler scaledWriterScheduler = buildScaledWriterScheduler(taskStatusProvider, 1);

scaledWriterScheduler.schedule();
assertThat(scaledWriterScheduler.schedule().getNewTasks().size()).isEqualTo(0);
try (ScaledWriterScheduler scaledWriterScheduler = buildScaledWriterScheduler(taskStatusProvider, 1)) {
scaledWriterScheduler.schedule();
assertThat(scaledWriterScheduler.schedule().getNewTasks().size()).isEqualTo(0);
}
}

private ScaledWriterScheduler buildScaleWriterSchedulerWithInitialTasks(TaskStatus taskStatus1, TaskStatus taskStatus2, TaskStatus taskStatus3)
Expand Down
Loading