Skip to content

[Backport] MSQ: Fix calculation of suggested memory in WorkerMemoryParameters. (#17108) #17215

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
kfaraz merged 1 commit into from
Oct 2, 2024
Merged

[Backport] MSQ: Fix calculation of suggested memory in WorkerMemoryParameters. (#17108) #17215

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
2 changes: 1 addition & 1 deletion ...ore/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerMemoryParameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ public static WorkerMemoryParameters createInstance(

final long minimumBundleFreeMemory = computeMinimumBundleFreeMemory(frameSize, numFramesPerOutputChannel);
if (bundleFreeMemory < minimumBundleFreeMemory) {
final long requiredTaskMemory = bundleMemory - bundleFreeMemory + minimumBundleFreeMemory;
final long requiredTaskMemory = (bundleMemory - bundleFreeMemory + minimumBundleFreeMemory) * maxConcurrentStages;
throw new MSQException(
new NotEnoughMemoryFault(
memoryIntrospector.computeJvmMemoryRequiredForTaskMemory(requiredTaskMemory),
Expand Down
49 changes: 49 additions & 0 deletions ...multi-stage-query/src/test/java/org/apache/druid/msq/exec/WorkerMemoryParametersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,55 @@ public void test_1WorkerInJvm_alone_40Threads_memoryFromError()
);
}

@Test
public void test_1WorkerInJvm_alone_40Threads_2ConcurrentStages()
{
final int numThreads = 40;
final int frameSize = WorkerMemoryParameters.DEFAULT_FRAME_SIZE;

final MemoryIntrospectorImpl memoryIntrospector = createMemoryIntrospector(1_250_000_000, 1, numThreads);
final List<InputSlice> slices = makeInputSlices(ReadablePartitions.striped(0, 1, numThreads));
final IntSet broadcastInputs = IntSets.emptySet();
final ShuffleSpec shuffleSpec = makeSortShuffleSpec();

final MSQException e = Assert.assertThrows(
MSQException.class,
() -> WorkerMemoryParameters.createInstance(
memoryIntrospector,
frameSize,
slices,
broadcastInputs,
shuffleSpec,
2,
1
)
);

Assert.assertEquals(
new NotEnoughMemoryFault(2_732_500_000L, 1_250_000_000, 1_000_000_000, 1, 40, 1, 2),
e.getFault()
);
}

@Test
public void test_1WorkerInJvm_alone_40Threads_2ConcurrentStages_memoryFromError()
{
// Test with the amount of memory recommended in the error message from
// test_1WorkerInJvm_alone_40Threads_2ConcurrentStages.
final int numThreads = 40;
final int frameSize = WorkerMemoryParameters.DEFAULT_FRAME_SIZE;

final MemoryIntrospectorImpl memoryIntrospector = createMemoryIntrospector(2_732_500_000L, 1, numThreads);
final List<InputSlice> slices = makeInputSlices(ReadablePartitions.striped(0, 1, numThreads));
final IntSet broadcastInputs = IntSets.emptySet();
final ShuffleSpec shuffleSpec = makeSortShuffleSpec();

Assert.assertEquals(
new WorkerMemoryParameters(13_000_000, frameSize, 1, 2, 250_000, 0),
WorkerMemoryParameters.createInstance(memoryIntrospector, frameSize, slices, broadcastInputs, shuffleSpec, 2, 1)
);
}

@Test
public void test_1WorkerInJvm_200WorkersInCluster_4Threads()
{
Expand Down