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

PHOENIX-6871 Fix write threads deadlock #1559

Merged
merged 2 commits into from
Feb 13, 2023
Merged

PHOENIX-6871 Fix write threads deadlock #1559

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
895d08d
PHOENIX-6871 Fix write threads deadlock
mnpoonia Feb 9, 2023
e43d8da
Add comment about Treeset importance
mnpoonia Feb 13, 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
11 changes: 6 additions & 5 deletions phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.TreeSet;
import java.util.concurrent.ConcurrentHashMap;

import org.apache.phoenix.thirdparty.com.google.common.collect.ArrayListMultimap;
Expand Down Expand Up @@ -227,7 +228,7 @@ public static class BatchMutateContext {
// The collection of candidate index mutations that will be applied after the data table mutations
private ListMultimap<HTableInterfaceReference, Pair<Mutation, byte[]>> indexUpdates;
private List<RowLock> rowLocks = Lists.newArrayListWithExpectedSize(QueryServicesOptions.DEFAULT_MUTATE_BATCH_SIZE);
private HashSet<ImmutableBytesPtr> rowsToLock = new HashSet<>();
private Set<ImmutableBytesPtr> rowsToLock = new TreeSet<>();
gjacoby126 marked this conversation as resolved.
Show resolved Hide resolved
// The current and next states of the data rows corresponding to the pending mutations
private HashMap<ImmutableBytesPtr, Pair<Put, Put>> dataRowStates;
// The previous concurrent batch contexts
Expand Down Expand Up @@ -494,17 +495,17 @@ private void ignoreAtomicOperations (MiniBatchOperationInProgress<Mutation> mini
}
}

private void populateRowsToLock(MiniBatchOperationInProgress<Mutation> miniBatchOp, BatchMutateContext context) {
private void populateRowsToLock(MiniBatchOperationInProgress<Mutation> miniBatchOp,
BatchMutateContext context) {
for (int i = 0; i < miniBatchOp.size(); i++) {
if (miniBatchOp.getOperationStatus(i) == IGNORE) {
continue;
}
Mutation m = miniBatchOp.getOperation(i);
if (this.builder.isAtomicOp(m) || this.builder.isEnabled(m)) {
ImmutableBytesPtr row = new ImmutableBytesPtr(m.getRow());
if (!context.rowsToLock.contains(row)) {
context.rowsToLock.add(row);
}
context.rowsToLock.add(row);

}
}
}
Expand Down