Skip to content

Fix FaultTolerantPartitioningScheme obtaining logic #19979

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
losipiuk merged 4 commits into from
Dec 1, 2023
Merged

Fix FaultTolerantPartitioningScheme obtaining logic #19979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
97c7f70
Fix FaultTolerantPartitioningScheme obtaining logic
losipiuk Nov 30, 2023
c73b0b8
Add sanity check
losipiuk Dec 1, 2023
b67b4ef
Extend set of test FTE config parameters
losipiuk Dec 1, 2023
6aa13dc
Test merge with cost based partition count determination
losipiuk Dec 1, 2023
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
9 changes: 0 additions & 9 deletions ...main/java/io/trino/execution/scheduler/faulttolerant/FaultTolerantPartitioningScheme.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,6 @@ public Optional<List<InternalNode>> getPartitionToNodeMap()
return partitionToNodeMap;
}

public FaultTolerantPartitioningScheme withPartitionCount(int partitionCount)
{
return new FaultTolerantPartitioningScheme(
partitionCount,
this.bucketToPartitionMap,
this.splitToBucketFunction,
this.partitionToNodeMap);
}

@Override
public String toString()
{
Expand Down
30 changes: 21 additions & 9 deletions ...va/io/trino/execution/scheduler/faulttolerant/FaultTolerantPartitioningSchemeFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import java.util.function.ToIntFunction;
import java.util.stream.IntStream;

import static com.google.common.base.Verify.verify;
import static io.trino.sql.planner.SystemPartitioningHandle.FIXED_HASH_DISTRIBUTION;
import static io.trino.sql.planner.SystemPartitioningHandle.SCALED_WRITER_HASH_DISTRIBUTION;
import static java.util.Objects.requireNonNull;
Expand All @@ -43,7 +44,7 @@ public class FaultTolerantPartitioningSchemeFactory
private final Session session;
private final int maxPartitionCount;

private final Map<PartitioningHandle, FaultTolerantPartitioningScheme> cache = new HashMap<>();
private final Map<CacheKey, FaultTolerantPartitioningScheme> cache = new HashMap<>();

public FaultTolerantPartitioningSchemeFactory(NodePartitioningManager nodePartitioningManager, Session session, int maxPartitionCount)
{
Expand All @@ -54,18 +55,20 @@ public FaultTolerantPartitioningSchemeFactory(NodePartitioningManager nodePartit

public FaultTolerantPartitioningScheme get(PartitioningHandle handle, Optional<Integer> partitionCount)
{
FaultTolerantPartitioningScheme result = cache.get(handle);
CacheKey cacheKey = new CacheKey(handle, partitionCount);
FaultTolerantPartitioningScheme result = cache.get(cacheKey);
if (result == null) {
// Avoid using computeIfAbsent as the "get" method is called recursively from the "create" method
result = create(handle, partitionCount);
cache.put(handle, result);
}
else if (partitionCount.isPresent()) {
// With runtime adaptive partitioning, it's no longer guaranteed that the same handle will always map to
// the same partition count. Therefore, use the supplied `partitionCount` as the source of truth.
result = result.withPartitionCount(partitionCount.get());
Copy link
Copy Markdown
Member

@findepi findepi Dec 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

withPartitionCount became unused, remove

Copy link
Copy Markdown
Member

@findepi findepi Dec 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

before the change, we guaranteed that "if value is taken from the cache, the partitionCount is made to be exactly as requested".
i don't know why we didn't guarantee that for new values.

maybe we could add this

if (partitionCount.isPresent()) {
  verify(result.getPartitionCount() == partitionCount.get(), "...");
}

however, create doesn't seem to guarantee this property -- return new FaultTolerantPartitioningScheme(1, ....

Thus this PR (1) fixes caching logic
and introduces a pretty subtle side-effect (maybe correct). If this side effect is intentional, it would be good to call it out (perhaps as separate commit)

Copy link
Copy Markdown
Member Author

@losipiuk losipiuk Dec 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am pretty sure this method should not be called with non-empty partition count for case when create would return scheme with partitionCount == 1.
verify seems like a good change.

if (partitionCount.isPresent()) {
verify(
result.getPartitionCount() == partitionCount.get(),
"expected partitionCount to be %s but got %s",
partitionCount.get(),
result.getPartitionCount());
}
cache.put(cacheKey, result);
}

return result;
}

Expand Down Expand Up @@ -143,4 +146,13 @@ private static FaultTolerantPartitioningScheme createArbitraryConnectorSpecificS
Optional.of(splitToBucket),
Optional.empty());
}

private record CacheKey(PartitioningHandle handle, Optional<Integer> partitionCount)
{
private CacheKey
{
requireNonNull(handle, "handle is null");
requireNonNull(partitionCount, "partitionCount is null");
}
}
}
28 changes: 17 additions & 11 deletions plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@
import static com.google.common.collect.Iterables.getOnlyElement;
import static com.google.common.collect.MoreCollectors.onlyElement;
import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
import static io.trino.SystemSessionProperties.DETERMINE_PARTITION_COUNT_FOR_WRITE_ENABLED;
import static io.trino.SystemSessionProperties.SCALE_WRITERS;
import static io.trino.SystemSessionProperties.TASK_MAX_WRITER_COUNT;
import static io.trino.SystemSessionProperties.TASK_MIN_WRITER_COUNT;
Expand Down Expand Up @@ -6428,23 +6429,28 @@ private void testMergeUpdateWithVariousLayouts(int writers, String partitioning)
@Override
public void testMergeMultipleOperations()
{
testMergeMultipleOperations(1, "");
testMergeMultipleOperations(4, "");
testMergeMultipleOperations(1, "WITH (partitioning = ARRAY['customer'])");
testMergeMultipleOperations(4, "WITH (partitioning = ARRAY['customer'])");
testMergeMultipleOperations(1, "WITH (partitioning = ARRAY['purchase'])");
testMergeMultipleOperations(4, "WITH (partitioning = ARRAY['purchase'])");
testMergeMultipleOperations(1, "WITH (partitioning = ARRAY['bucket(customer, 3)'])");
testMergeMultipleOperations(4, "WITH (partitioning = ARRAY['bucket(customer, 3)'])");
testMergeMultipleOperations(1, "WITH (partitioning = ARRAY['bucket(purchase, 4)'])");
testMergeMultipleOperations(4, "WITH (partitioning = ARRAY['bucket(purchase, 4)'])");
testMergeMultipleOperations(1, "", false);
testMergeMultipleOperations(4, "", false);
testMergeMultipleOperations(1, "WITH (partitioning = ARRAY['customer'])", false);
testMergeMultipleOperations(4, "WITH (partitioning = ARRAY['customer'])", false);
testMergeMultipleOperations(1, "WITH (partitioning = ARRAY['purchase'])", false);
testMergeMultipleOperations(4, "WITH (partitioning = ARRAY['purchase'])", false);
testMergeMultipleOperations(1, "WITH (partitioning = ARRAY['bucket(customer, 3)'])", false);
testMergeMultipleOperations(4, "WITH (partitioning = ARRAY['bucket(customer, 3)'])", false);
testMergeMultipleOperations(1, "WITH (partitioning = ARRAY['bucket(purchase, 4)'])", false);
testMergeMultipleOperations(4, "WITH (partitioning = ARRAY['bucket(purchase, 4)'])", false);
testMergeMultipleOperations(1, "", true);
testMergeMultipleOperations(4, "WITH (partitioning = ARRAY['customer'])", true);
testMergeMultipleOperations(1, "WITH (partitioning = ARRAY['bucket(customer, 3)'])", true);
testMergeMultipleOperations(4, "WITH (partitioning = ARRAY['bucket(purchase, 4)'])", true);
Copy link
Copy Markdown
Member

@findepi findepi Dec 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a data provider would produce much more readable failure messages
otherwise when inspecting CI error message you need to hope the line numbers didn't change between CI and your local copy

out of scope for this pr

}

public void testMergeMultipleOperations(int writers, String partitioning)
public void testMergeMultipleOperations(int writers, String partitioning, boolean determinePartitionCountForWrite)
{
Session session = Session.builder(getSession())
.setSystemProperty(TASK_MIN_WRITER_COUNT, String.valueOf(writers))
.setSystemProperty(TASK_MAX_WRITER_COUNT, String.valueOf(writers))
.setSystemProperty(DETERMINE_PARTITION_COUNT_FOR_WRITE_ENABLED, Boolean.toString(determinePartitionCountForWrite))
.build();

int targetCustomerCount = 32;
Expand Down
2 changes: 2 additions & 0 deletions ...ino-testing/src/main/java/io/trino/testing/FaultTolerantExecutionConnectorTestHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ public static Map<String, String> getExtraProperties()
.put("retry-policy", "TASK")
.put("retry-initial-delay", "50ms")
.put("retry-max-delay", "100ms")
.put("fault-tolerant-execution-min-partition-count", "4")
.put("fault-tolerant-execution-max-partition-count", "5")
.put("fault-tolerant-execution-min-partition-count-for-write", "4")
.put("fault-tolerant-execution-arbitrary-distribution-compute-task-target-size-min", "5MB")
.put("fault-tolerant-execution-arbitrary-distribution-compute-task-target-size-max", "10MB")
.put("fault-tolerant-execution-arbitrary-distribution-write-task-target-size-min", "10MB")
Expand Down