PHOENIX-6871 Fix write threads deadlock #1559
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@tkhurana FYI |
| @@ -502,9 +503,10 @@ private void populateRowsToLock(MiniBatchOperationInProgress<Mutation> miniBatch | |||
| 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)) { | |||
| // This seems to be unnecessary as we are using a set here | |||
| // if (!context.rowsToLock.contains(row)) { | |||
There was a problem hiding this comment.
Thanks for improving this - can you remove this commented code, as don't think this needs to be checked in.
There was a problem hiding this comment.
Thanks @mnpoonia . Looks good. Please remove the comments as suggested by @gourabtaparia
|
Test failure FailoverPhoenixConnectionIT.testConnectionWhenActiveZKRestarts It is unrelated. |
virajjasani
reviewed
Feb 10, 2023
| @@ -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 TreeSet<ImmutableBytesPtr> rowsToLock = new TreeSet<>(); | |||
There was a problem hiding this comment.
nit: private Set<ImmutableBytesPtr> rowsToLock = new TreeSet<>()
mnpoonia
force-pushed
the
fix_write_deadlock
branch
from
a33b435
to
a15d733
Compare
mnpoonia
force-pushed
the
fix_write_deadlock
branch
from
a15d733
to
895d08d
Compare
|
@gourabtaparia @tkhurana @virajjasani Please review and merge if changes look good |
gjacoby126
reviewed
Feb 10, 2023
phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java
Show resolved
Hide resolved
mnpoonia
force-pushed
the
fix_write_deadlock
branch
from
d1cbdd0
to
e43d8da
Compare
tkhurana
approved these changes
Feb 13, 2023
|
Belated +1, thank you @mnpoonia! |
|
@tkhurana @virajjasani Can you cherrypick to 5.1 branch as well. |
virajjasani
pushed a commit
that referenced
this pull request
Mar 2, 2023
* PHOENIX-6871 Fix write threads deadlock * Add comment about Treeset importance
|
Done @mnpoonia |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.