denis-chudov commented on code in PR #2867:
URL: https://github.com/apache/ignite-3/pull/2867#discussion_r1431172243
##########
modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java:
##########
@@ -1988,51 +1981,94 @@ protected CompletableFuture<Void>
handleChangeStableAssignmentEvent(WatchEvent e
// these updates always processing only 1 partition, so, only 1 stable
partition key.
assert evt.single() : evt;
+ if (evt.entryEvent().oldEntry() == null) {
+ // This means it's an event on table creation.
+ return nullCompletedFuture();
+ }
+
Entry stableAssignmentsWatchEvent = evt.entryEvent().newEntry();
+ long revision = evt.revision();
+
+ assert stableAssignmentsWatchEvent.revision() == revision :
stableAssignmentsWatchEvent;
+
if (stableAssignmentsWatchEvent.value() == null) {
return nullCompletedFuture();
}
+ return handleChangeStableAssignmentEvent(stableAssignmentsWatchEvent,
evt.revision(), false);
+ }
+
+ protected CompletableFuture<Void> handleChangeStableAssignmentEvent(
+ Entry stableAssignmentsWatchEvent,
+ long revision,
+ boolean isRecovery
+ ) {
int partitionId =
extractPartitionNumber(stableAssignmentsWatchEvent.key());
int tableId = extractTableId(stableAssignmentsWatchEvent.key(),
STABLE_ASSIGNMENTS_PREFIX);
TablePartitionId tablePartitionId = new TablePartitionId(tableId,
partitionId);
Set<Assignment> stableAssignments =
ByteUtils.fromBytes(stableAssignmentsWatchEvent.value());
- return metaStorageMgr.get(pendingPartAssignmentsKey(tablePartitionId),
stableAssignmentsWatchEvent.revision())
+ return metaStorageMgr.get(pendingPartAssignmentsKey(tablePartitionId),
revision)
.thenComposeAsync(pendingAssignmentsEntry -> {
- // Update raft client peers and learners according to the
actual assignments.
- CompletableFuture<Void> raftClientUpdateFuture =
tablesById(evt.revision()).thenAccept(t -> {
- t.get(tableId).internalTable()
-
.partitionRaftGroupService(tablePartitionId.partitionId())
-
.updateConfiguration(configurationFromAssignments(stableAssignments));
- });
-
byte[] pendingAssignmentsFromMetaStorage =
pendingAssignmentsEntry.value();
Set<Assignment> pendingAssignments =
pendingAssignmentsFromMetaStorage == null
? Set.of()
:
ByteUtils.fromBytes(pendingAssignmentsFromMetaStorage);
- String localMemberName = localNode().name();
+ return stopAndDestroyPartitionAndUpdateClients(
+ tablePartitionId,
+ stableAssignments,
+ pendingAssignments,
+ isRecovery,
+ revision
+ );
+ }, ioExecutor);
+ }
- boolean shouldStopLocalServices =
Stream.concat(stableAssignments.stream(), pendingAssignments.stream())
- .noneMatch(assignment ->
assignment.consistentId().equals(localMemberName));
+ private CompletableFuture<Void> updateClientsOnPartitionStop(
Review Comment:
Because it appears that we should only stop partitions on handling of stable
assignments. I decided to move this part to separate method because it improved
the readability of code, as for me.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
