IGNITE-24283 Fix data race in raft pipeline on command retry #5124
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
…nto ignite-24283 # Conflicts: # modules/raft/src/main/java/org/apache/ignite/internal/raft/server/impl/JraftServerImpl.java
ascherbakoff
changed the title
rpuch
reviewed
Jan 30, 2025
modules/raft/src/main/java/org/apache/ignite/raft/jraft/rpc/impl/ActionRequestProcessor.java
Outdated
Show resolved
Hide resolved
modules/raft/src/main/java/org/apache/ignite/raft/jraft/core/NodeImpl.java
Show resolved
Hide resolved
modules/raft/src/main/java/org/apache/ignite/internal/raft/server/impl/JraftServerImpl.java
Show resolved
Hide resolved
modules/raft-api/src/main/java/org/apache/ignite/internal/raft/WriteCommand.java
Outdated
Show resolved
Hide resolved
...t-api/src/main/java/org/apache/ignite/internal/raft/service/SafeTimeAwareCommandClosure.java
Outdated
Show resolved
Hide resolved
.../src/integrationTest/java/org/apache/ignite/distributed/ReplicasSafeTimePropagationTest.java
Outdated
Show resolved
Hide resolved
...table/src/main/java/org/apache/ignite/internal/table/distributed/raft/PartitionListener.java
Outdated
Show resolved
Hide resolved
...table/src/main/java/org/apache/ignite/internal/table/distributed/raft/PartitionListener.java
Outdated
Show resolved
Hide resolved
...n/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java
Outdated
Show resolved
Hide resolved
| @@ -36,6 +36,7 @@ public class UpdateCommandResult implements Serializable { | |||
| /** {@code true} if primary replica belongs to the raft group topology: peers and learners, (@code false) otherwise. */ | |||
| private final boolean primaryInPeersAndLearners; | |||
|
|
|||
| /** The safe timestamp. */ | |||
There was a problem hiding this comment.
According to the code, 0 might be assigned to this field instead of the real safe time requested by the command. If this behavior will be retained, please mention here that 0 can be stored in the field and what it means.
There was a problem hiding this comment.
0 (HybridTimestamp.NULL_HYBRID_TIMESTAMP) means value is 'null'.
See the change above.
Not sure it needs additional comment.
There was a problem hiding this comment.
It could be useful for someone who is new to the code. Up to you
rpuch
approved these changes
Jan 30, 2025
vldpyatkov
approved these changes
Jan 30, 2025
ptupitsyn
changed the title
ptupitsyn
changed the title
ptupitsyn
pushed a commit
that referenced
this pull request
Jan 30, 2025
(cherry picked from commit e9fd786)
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.
The root cause is modifying shared raft command state (patching safets) on retry, causing a race with FSM application.
The fix idea is to incapsulate safe timestamp in command closure instead passing it in the raft command.