alievmirza commented on code in PR #5584: URL: https://github.com/apache/ignite-3/pull/5584#discussion_r2050442749
########## modules/table/src/main/java/org/apache/ignite/internal/table/distributed/disaster/GroupUpdateRequestHandler.java: ########## @@ -0,0 +1,642 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.table.distributed.disaster; + +import static java.util.Collections.emptyMap; +import static java.util.Collections.emptySet; +import static java.util.concurrent.CompletableFuture.allOf; +import static java.util.concurrent.CompletableFuture.completedFuture; +import static java.util.concurrent.CompletableFuture.failedFuture; +import static java.util.stream.Collectors.toSet; +import static org.apache.ignite.internal.distributionzones.rebalance.RebalanceUtil.UpdateStatus.ASSIGNMENT_NOT_UPDATED; +import static org.apache.ignite.internal.distributionzones.rebalance.RebalanceUtil.UpdateStatus.OUTDATED_UPDATE_RECEIVED; +import static org.apache.ignite.internal.distributionzones.rebalance.RebalanceUtil.UpdateStatus.PENDING_KEY_UPDATED; +import static org.apache.ignite.internal.distributionzones.rebalance.RebalanceUtil.tableStableAssignments; +import static org.apache.ignite.internal.distributionzones.rebalance.ZoneRebalanceUtil.zoneStableAssignments; +import static org.apache.ignite.internal.metastorage.dsl.Conditions.notExists; +import static org.apache.ignite.internal.metastorage.dsl.Conditions.value; +import static org.apache.ignite.internal.metastorage.dsl.Operations.ops; +import static org.apache.ignite.internal.metastorage.dsl.Operations.put; +import static org.apache.ignite.internal.metastorage.dsl.Operations.remove; +import static org.apache.ignite.internal.metastorage.dsl.Statements.iif; +import static org.apache.ignite.internal.partition.replicator.network.disaster.LocalPartitionStateEnum.CATCHING_UP; +import static org.apache.ignite.internal.partition.replicator.network.disaster.LocalPartitionStateEnum.HEALTHY; +import static org.apache.ignite.internal.partitiondistribution.PartitionDistributionUtils.calculateAssignmentForPartition; +import static org.apache.ignite.internal.partitiondistribution.PendingAssignmentsCalculator.pendingAssignmentsCalculator; +import static org.apache.ignite.internal.table.distributed.disaster.DisasterRecoveryManager.tableState; +import static org.apache.ignite.internal.table.distributed.disaster.DisasterRecoveryManager.zoneState; +import static org.apache.ignite.internal.util.ByteUtils.longToBytesKeepingOrder; +import static org.apache.ignite.internal.util.CompletableFutures.nullCompletedFuture; +import static org.apache.ignite.lang.ErrorGroups.DisasterRecovery.CLUSTER_NOT_IDLE_ERR; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.CompletableFuture; +import java.util.function.Function; +import org.apache.ignite.internal.catalog.Catalog; +import org.apache.ignite.internal.catalog.descriptors.CatalogZoneDescriptor; +import org.apache.ignite.internal.distributionzones.NodeWithAttributes; +import org.apache.ignite.internal.distributionzones.rebalance.AssignmentUtil; +import org.apache.ignite.internal.distributionzones.rebalance.RebalanceUtil; +import org.apache.ignite.internal.distributionzones.rebalance.RebalanceUtil.UpdateStatus; +import org.apache.ignite.internal.distributionzones.rebalance.ZoneRebalanceUtil; +import org.apache.ignite.internal.hlc.HybridTimestamp; +import org.apache.ignite.internal.lang.ByteArray; +import org.apache.ignite.internal.lang.IgniteStringFormatter; +import org.apache.ignite.internal.logger.IgniteLogger; +import org.apache.ignite.internal.logger.Loggers; +import org.apache.ignite.internal.metastorage.MetaStorageManager; +import org.apache.ignite.internal.metastorage.dsl.Iif; +import org.apache.ignite.internal.partition.replicator.network.disaster.LocalPartitionStateEnum; +import org.apache.ignite.internal.partition.replicator.network.disaster.LocalPartitionStateMessage; +import org.apache.ignite.internal.partitiondistribution.Assignment; +import org.apache.ignite.internal.partitiondistribution.Assignments; +import org.apache.ignite.internal.partitiondistribution.AssignmentsQueue; +import org.apache.ignite.internal.replicator.PartitionGroupId; +import org.apache.ignite.internal.replicator.TablePartitionId; +import org.apache.ignite.internal.replicator.ZonePartitionId; +import org.apache.ignite.internal.table.distributed.disaster.exceptions.DisasterRecoveryException; +import org.apache.ignite.internal.util.CollectionUtils; +import org.jetbrains.annotations.Nullable; + +/** + * A colocation-aware handler for {@link GroupUpdateRequest}. + */ +abstract class GroupUpdateRequestHandler<T extends PartitionGroupId> { + private static final IgniteLogger LOG = Loggers.forClass(GroupUpdateRequest.class); + + private final GroupUpdateRequest request; + + public static GroupUpdateRequestHandler<?> handler(GroupUpdateRequest request) { + return request.colocationEnabled() + ? new ZoneGroupUpdateRequestHandler(request) + : new TableGroupUpdateRequestHandler(request); + } + + GroupUpdateRequestHandler(GroupUpdateRequest request) { + this.request = request; + } + + public CompletableFuture<Void> handle(DisasterRecoveryManager disasterRecoveryManager, long msRevision, HybridTimestamp msTimestamp) { + int catalogVersion = disasterRecoveryManager.catalogManager.activeCatalogVersion(msTimestamp.longValue()); + + if (request.catalogVersion() != catalogVersion) { + return failedFuture( + new DisasterRecoveryException(CLUSTER_NOT_IDLE_ERR, "Cluster is not idle, concurrent DDL update detected.") + ); + } + + Catalog catalog = disasterRecoveryManager.catalogManager.catalog(catalogVersion); + + int zoneId = request.zoneId(); + + CatalogZoneDescriptor zoneDescriptor = catalog.zone(zoneId); + + Set<Integer> allZonePartitionsToReset = new HashSet<>(); + request.partitionIds().values().forEach(allZonePartitionsToReset::addAll); + + CompletableFuture<Set<String>> dataNodesFuture = + disasterRecoveryManager.dzManager.dataNodes(msTimestamp, catalogVersion, zoneId); + + CompletableFuture<Map<T, LocalPartitionStateMessageByNode>> localStatesFuture = + localStatesFuture(disasterRecoveryManager, Set.of(zoneDescriptor.name()), allZonePartitionsToReset, catalog); + + return dataNodesFuture.thenCombine(localStatesFuture, (dataNodes, localStatesMap) -> { + Set<String> nodeConsistentIds = disasterRecoveryManager.dzManager.logicalTopology(msRevision) + .stream() + .map(NodeWithAttributes::nodeName) + .collect(toSet()); + + List<CompletableFuture<Void>> assignmentsUpdateFuts = new ArrayList<>(request.partitionIds().size()); + + for (Entry<Integer, Set<Integer>> partitionEntry : request.partitionIds().entrySet()) { + + int[] partitionIdsArray = AssignmentUtil.partitionIds(partitionEntry.getValue(), zoneDescriptor.partitions()); + + assignmentsUpdateFuts.add(forceAssignmentsUpdate( + partitionEntry.getKey(), + zoneDescriptor, + dataNodes, + nodeConsistentIds, + msRevision, + msTimestamp, + disasterRecoveryManager.metaStorageManager, + localStatesMap, + catalog.time(), + partitionIdsArray, + request.manualUpdate() + )); + } + + return allOf(assignmentsUpdateFuts.toArray(new CompletableFuture[]{})); + }) + .thenCompose(Function.identity()) + .whenComplete((unused, throwable) -> { + // TODO: IGNITE-23635 Add fail handling for failed resetPeers + if (throwable != null) { + LOG.error("Failed to reset partition", throwable); + } + }); + } + + /** + * Sets force assignments for the zone/table if it's required. The condition for force reassignment is the absence of stable + * assignments' majority within the set of currently alive nodes. In this case we calculate new assignments that include all alive + * stable nodes, and try to save ot with a {@link Assignments#force()} flag enabled. + * + * @param replicationId Table id or Zone id. + * @param zoneDescriptor Zone descriptor. + * @param dataNodes Current DZ data nodes. + * @param aliveNodesConsistentIds Set of alive nodes according to logical topology. + * @param revision Meta-storage revision to be associated with reassignment. + * @param timestamp Meta-storage timestamp to be associated with reassignment. + * @param metaStorageManager Meta-storage manager. + * @param localStatesMap Local partition states retrieved by + * {@link DisasterRecoveryManager#localTablePartitionStates(Set, Set, Set)}. + * @return A future that will be completed when reassignments data is written into a meta-storage, if that's required. + */ + private CompletableFuture<Void> forceAssignmentsUpdate( + int replicationId, + CatalogZoneDescriptor zoneDescriptor, + Set<String> dataNodes, + Set<String> aliveNodesConsistentIds, + long revision, + HybridTimestamp timestamp, + MetaStorageManager metaStorageManager, + Map<T, LocalPartitionStateMessageByNode> localStatesMap, + long assignmentsTimestamp, + int[] partitionIds, + boolean manualUpdate + ) { + CompletableFuture<Map<Integer, Assignments>> stableAssignments = + stableAssignments(metaStorageManager, replicationId, partitionIds); + return stableAssignments + .thenCompose(assignments -> { + if (assignments.isEmpty()) { + return nullCompletedFuture(); + } + + return updateAssignments( + replicationId, + zoneDescriptor, + dataNodes, + aliveNodesConsistentIds, + revision, + timestamp, + metaStorageManager, + localStatesMap, + assignmentsTimestamp, + partitionIds, + assignments, + manualUpdate + ); + }); + } + + private CompletableFuture<Void> updateAssignments( + int replicationId, + CatalogZoneDescriptor zoneDescriptor, + Set<String> dataNodes, + Set<String> aliveNodesConsistentIds, + long revision, + HybridTimestamp timestamp, + MetaStorageManager metaStorageManager, + Map<T, LocalPartitionStateMessageByNode> localStatesMap, + long assignmentsTimestamp, + int[] partitionIds, + Map<Integer, Assignments> tableAssignments, Review Comment: bad naming, this is not always table assignments ########## modules/transactions/src/integrationTest/java/org/apache/ignite/internal/disaster/ItDisasterRecoveryReconfigurationTest.java: ########## @@ -107,12 +107,18 @@ import org.apache.ignite.internal.raft.RaftNodeId; import org.apache.ignite.internal.raft.WriteCommand; import org.apache.ignite.internal.raft.server.impl.JraftServerImpl; +import org.apache.ignite.internal.replicator.PartitionGroupId; import org.apache.ignite.internal.replicator.TablePartitionId; +import org.apache.ignite.internal.replicator.ZonePartitionId; import org.apache.ignite.internal.table.TableViewInternal; import org.apache.ignite.internal.table.distributed.TableManager; +import org.apache.ignite.internal.table.distributed.disaster.DisasterRecoveryManager; +import org.apache.ignite.internal.table.distributed.disaster.GlobalPartitionState; import org.apache.ignite.internal.table.distributed.disaster.GlobalPartitionStateEnum; import org.apache.ignite.internal.table.distributed.disaster.GlobalTablePartitionState; +import org.apache.ignite.internal.table.distributed.disaster.LocalPartitionStateByNode; import org.apache.ignite.internal.table.distributed.disaster.LocalTablePartitionStateByNode; +import org.apache.ignite.internal.table.distributed.disaster.TestDisasterRecoveryUtils; Review Comment: I do not understand, could you please point me to any test, were we check that new `resetPartitions` method is checked? I was expecting that all tests where resetPartitions with `manualUpdate=true` flag are tested will be also tested with flag `COLOCATION_FEATURE_FLAG` = true ########## modules/table/src/main/java/org/apache/ignite/internal/table/distributed/disaster/GroupUpdateRequestHandler.java: ########## @@ -0,0 +1,642 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.table.distributed.disaster; + +import static java.util.Collections.emptyMap; +import static java.util.Collections.emptySet; +import static java.util.concurrent.CompletableFuture.allOf; +import static java.util.concurrent.CompletableFuture.completedFuture; +import static java.util.concurrent.CompletableFuture.failedFuture; +import static java.util.stream.Collectors.toSet; +import static org.apache.ignite.internal.distributionzones.rebalance.RebalanceUtil.UpdateStatus.ASSIGNMENT_NOT_UPDATED; +import static org.apache.ignite.internal.distributionzones.rebalance.RebalanceUtil.UpdateStatus.OUTDATED_UPDATE_RECEIVED; +import static org.apache.ignite.internal.distributionzones.rebalance.RebalanceUtil.UpdateStatus.PENDING_KEY_UPDATED; +import static org.apache.ignite.internal.distributionzones.rebalance.RebalanceUtil.tableStableAssignments; +import static org.apache.ignite.internal.distributionzones.rebalance.ZoneRebalanceUtil.zoneStableAssignments; +import static org.apache.ignite.internal.metastorage.dsl.Conditions.notExists; +import static org.apache.ignite.internal.metastorage.dsl.Conditions.value; +import static org.apache.ignite.internal.metastorage.dsl.Operations.ops; +import static org.apache.ignite.internal.metastorage.dsl.Operations.put; +import static org.apache.ignite.internal.metastorage.dsl.Operations.remove; +import static org.apache.ignite.internal.metastorage.dsl.Statements.iif; +import static org.apache.ignite.internal.partition.replicator.network.disaster.LocalPartitionStateEnum.CATCHING_UP; +import static org.apache.ignite.internal.partition.replicator.network.disaster.LocalPartitionStateEnum.HEALTHY; +import static org.apache.ignite.internal.partitiondistribution.PartitionDistributionUtils.calculateAssignmentForPartition; +import static org.apache.ignite.internal.partitiondistribution.PendingAssignmentsCalculator.pendingAssignmentsCalculator; +import static org.apache.ignite.internal.table.distributed.disaster.DisasterRecoveryManager.tableState; +import static org.apache.ignite.internal.table.distributed.disaster.DisasterRecoveryManager.zoneState; +import static org.apache.ignite.internal.util.ByteUtils.longToBytesKeepingOrder; +import static org.apache.ignite.internal.util.CompletableFutures.nullCompletedFuture; +import static org.apache.ignite.lang.ErrorGroups.DisasterRecovery.CLUSTER_NOT_IDLE_ERR; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.CompletableFuture; +import java.util.function.Function; +import org.apache.ignite.internal.catalog.Catalog; +import org.apache.ignite.internal.catalog.descriptors.CatalogZoneDescriptor; +import org.apache.ignite.internal.distributionzones.NodeWithAttributes; +import org.apache.ignite.internal.distributionzones.rebalance.AssignmentUtil; +import org.apache.ignite.internal.distributionzones.rebalance.RebalanceUtil; +import org.apache.ignite.internal.distributionzones.rebalance.RebalanceUtil.UpdateStatus; +import org.apache.ignite.internal.distributionzones.rebalance.ZoneRebalanceUtil; +import org.apache.ignite.internal.hlc.HybridTimestamp; +import org.apache.ignite.internal.lang.ByteArray; +import org.apache.ignite.internal.lang.IgniteStringFormatter; +import org.apache.ignite.internal.logger.IgniteLogger; +import org.apache.ignite.internal.logger.Loggers; +import org.apache.ignite.internal.metastorage.MetaStorageManager; +import org.apache.ignite.internal.metastorage.dsl.Iif; +import org.apache.ignite.internal.partition.replicator.network.disaster.LocalPartitionStateEnum; +import org.apache.ignite.internal.partition.replicator.network.disaster.LocalPartitionStateMessage; +import org.apache.ignite.internal.partitiondistribution.Assignment; +import org.apache.ignite.internal.partitiondistribution.Assignments; +import org.apache.ignite.internal.partitiondistribution.AssignmentsQueue; +import org.apache.ignite.internal.replicator.PartitionGroupId; +import org.apache.ignite.internal.replicator.TablePartitionId; +import org.apache.ignite.internal.replicator.ZonePartitionId; +import org.apache.ignite.internal.table.distributed.disaster.exceptions.DisasterRecoveryException; +import org.apache.ignite.internal.util.CollectionUtils; +import org.jetbrains.annotations.Nullable; + +/** + * A colocation-aware handler for {@link GroupUpdateRequest}. + */ +abstract class GroupUpdateRequestHandler<T extends PartitionGroupId> { + private static final IgniteLogger LOG = Loggers.forClass(GroupUpdateRequest.class); + + private final GroupUpdateRequest request; + + public static GroupUpdateRequestHandler<?> handler(GroupUpdateRequest request) { + return request.colocationEnabled() + ? new ZoneGroupUpdateRequestHandler(request) + : new TableGroupUpdateRequestHandler(request); + } + + GroupUpdateRequestHandler(GroupUpdateRequest request) { + this.request = request; + } + + public CompletableFuture<Void> handle(DisasterRecoveryManager disasterRecoveryManager, long msRevision, HybridTimestamp msTimestamp) { + int catalogVersion = disasterRecoveryManager.catalogManager.activeCatalogVersion(msTimestamp.longValue()); + + if (request.catalogVersion() != catalogVersion) { + return failedFuture( + new DisasterRecoveryException(CLUSTER_NOT_IDLE_ERR, "Cluster is not idle, concurrent DDL update detected.") + ); + } + + Catalog catalog = disasterRecoveryManager.catalogManager.catalog(catalogVersion); + + int zoneId = request.zoneId(); + + CatalogZoneDescriptor zoneDescriptor = catalog.zone(zoneId); + + Set<Integer> allZonePartitionsToReset = new HashSet<>(); + request.partitionIds().values().forEach(allZonePartitionsToReset::addAll); + + CompletableFuture<Set<String>> dataNodesFuture = + disasterRecoveryManager.dzManager.dataNodes(msTimestamp, catalogVersion, zoneId); + + CompletableFuture<Map<T, LocalPartitionStateMessageByNode>> localStatesFuture = + localStatesFuture(disasterRecoveryManager, Set.of(zoneDescriptor.name()), allZonePartitionsToReset, catalog); + + return dataNodesFuture.thenCombine(localStatesFuture, (dataNodes, localStatesMap) -> { + Set<String> nodeConsistentIds = disasterRecoveryManager.dzManager.logicalTopology(msRevision) + .stream() + .map(NodeWithAttributes::nodeName) + .collect(toSet()); + + List<CompletableFuture<Void>> assignmentsUpdateFuts = new ArrayList<>(request.partitionIds().size()); + + for (Entry<Integer, Set<Integer>> partitionEntry : request.partitionIds().entrySet()) { + + int[] partitionIdsArray = AssignmentUtil.partitionIds(partitionEntry.getValue(), zoneDescriptor.partitions()); + + assignmentsUpdateFuts.add(forceAssignmentsUpdate( + partitionEntry.getKey(), + zoneDescriptor, + dataNodes, + nodeConsistentIds, + msRevision, + msTimestamp, + disasterRecoveryManager.metaStorageManager, + localStatesMap, + catalog.time(), + partitionIdsArray, + request.manualUpdate() + )); + } + + return allOf(assignmentsUpdateFuts.toArray(new CompletableFuture[]{})); + }) + .thenCompose(Function.identity()) + .whenComplete((unused, throwable) -> { + // TODO: IGNITE-23635 Add fail handling for failed resetPeers + if (throwable != null) { + LOG.error("Failed to reset partition", throwable); + } + }); + } + + /** + * Sets force assignments for the zone/table if it's required. The condition for force reassignment is the absence of stable + * assignments' majority within the set of currently alive nodes. In this case we calculate new assignments that include all alive + * stable nodes, and try to save ot with a {@link Assignments#force()} flag enabled. + * + * @param replicationId Table id or Zone id. + * @param zoneDescriptor Zone descriptor. + * @param dataNodes Current DZ data nodes. + * @param aliveNodesConsistentIds Set of alive nodes according to logical topology. + * @param revision Meta-storage revision to be associated with reassignment. + * @param timestamp Meta-storage timestamp to be associated with reassignment. + * @param metaStorageManager Meta-storage manager. + * @param localStatesMap Local partition states retrieved by + * {@link DisasterRecoveryManager#localTablePartitionStates(Set, Set, Set)}. + * @return A future that will be completed when reassignments data is written into a meta-storage, if that's required. + */ + private CompletableFuture<Void> forceAssignmentsUpdate( + int replicationId, + CatalogZoneDescriptor zoneDescriptor, + Set<String> dataNodes, + Set<String> aliveNodesConsistentIds, + long revision, + HybridTimestamp timestamp, + MetaStorageManager metaStorageManager, + Map<T, LocalPartitionStateMessageByNode> localStatesMap, + long assignmentsTimestamp, + int[] partitionIds, + boolean manualUpdate + ) { + CompletableFuture<Map<Integer, Assignments>> stableAssignments = + stableAssignments(metaStorageManager, replicationId, partitionIds); + return stableAssignments + .thenCompose(assignments -> { + if (assignments.isEmpty()) { + return nullCompletedFuture(); + } + + return updateAssignments( + replicationId, + zoneDescriptor, + dataNodes, + aliveNodesConsistentIds, + revision, + timestamp, + metaStorageManager, + localStatesMap, + assignmentsTimestamp, + partitionIds, + assignments, + manualUpdate + ); + }); + } + + private CompletableFuture<Void> updateAssignments( + int replicationId, + CatalogZoneDescriptor zoneDescriptor, + Set<String> dataNodes, + Set<String> aliveNodesConsistentIds, + long revision, + HybridTimestamp timestamp, + MetaStorageManager metaStorageManager, + Map<T, LocalPartitionStateMessageByNode> localStatesMap, + long assignmentsTimestamp, + int[] partitionIds, + Map<Integer, Assignments> tableAssignments, + boolean manualUpdate + ) { + Set<String> aliveDataNodes = CollectionUtils.intersect(dataNodes, aliveNodesConsistentIds); + + CompletableFuture<?>[] futures = new CompletableFuture[partitionIds.length]; + + for (int i = 0; i < partitionIds.length; i++) { + T replicaGrpId = replicationGroupId(replicationId, partitionIds[i]); + LocalPartitionStateMessageByNode localStatesByNode = localStatesMap.containsKey(replicaGrpId) + ? localStatesMap.get(replicaGrpId) + : new LocalPartitionStateMessageByNode(emptyMap()); + + futures[i] = partitionUpdate( + replicaGrpId, + aliveDataNodes, + aliveNodesConsistentIds, + zoneDescriptor.partitions(), + zoneDescriptor.replicas(), + revision, + timestamp, + metaStorageManager, + tableAssignments.get(replicaGrpId.partitionId()).nodes(), + localStatesByNode, + assignmentsTimestamp, + manualUpdate + ).thenAccept(res -> { + DisasterRecoveryManager.LOG.info( + "Partition {} returned {} status on reset attempt", replicaGrpId, UpdateStatus.valueOf(res) + ); + }); + } + + return allOf(futures); + } + + private CompletableFuture<Integer> partitionUpdate( + T partId, + Collection<String> aliveDataNodes, + Set<String> aliveNodesConsistentIds, + int partitions, + int replicas, + long revision, + HybridTimestamp timestamp, + MetaStorageManager metaStorageMgr, + Set<Assignment> currentAssignments, + LocalPartitionStateMessageByNode localPartitionStateMessageByNode, + long assignmentsTimestamp, + boolean manualUpdate + ) { + Set<Assignment> partAssignments = getAliveNodesWithData(aliveNodesConsistentIds, localPartitionStateMessageByNode); + Set<Assignment> aliveStableNodes = CollectionUtils.intersect(currentAssignments, partAssignments); + + if (aliveStableNodes.size() >= (replicas / 2 + 1)) { + return completedFuture(ASSIGNMENT_NOT_UPDATED.ordinal()); + } + + if (aliveStableNodes.isEmpty() && !manualUpdate) { + return completedFuture(ASSIGNMENT_NOT_UPDATED.ordinal()); + } + + if (manualUpdate) { + enrichAssignments(partId, aliveDataNodes, partitions, replicas, partAssignments); + } + + Assignment nextAssignment = nextAssignment(localPartitionStateMessageByNode, partAssignments); + + boolean isProposedPendingEqualsProposedPlanned = partAssignments.size() == 1; + + assert partAssignments.contains(nextAssignment) : IgniteStringFormatter.format( + "Recovery nodes set doesn't contain the reset node assignment [partAssignments={}, nextAssignment={}]", + partAssignments, + nextAssignment + ); + + // There are nodes with data, and we set pending assignments to this set of nodes. It'll be the source of peers for + // "resetPeers", and after that new assignments with restored replica factor wil be picked up from planned assignments + // for the case of the manual update, that was triggered by a user. + AssignmentsQueue assignmentsQueue = pendingAssignmentsCalculator() + .stable(Assignments.of(currentAssignments, assignmentsTimestamp)) + .target(Assignments.forced(Set.of(nextAssignment), assignmentsTimestamp)) + .toQueue(); + + return invoke( + partId, + revision, + timestamp, + metaStorageMgr, + assignmentsTimestamp, + assignmentsQueue, + isProposedPendingEqualsProposedPlanned, + partAssignments + ); + } + + /** + * Returns an assignment with the most up to date log index, if there are more than one node with the same index, returns the first one + * in the lexicographic order. + */ + private static Assignment nextAssignment( + LocalPartitionStateMessageByNode localPartitionStateByNode, + Set<Assignment> assignments + ) { + // For nodes that we know log index for (having any data), we choose the node with the highest log index. + // If there are more than one node with same log index, we choose the one with the first consistent id in the lexicographic order. + Optional<Assignment> nodeWithMaxLogIndex = assignments.stream() + .filter(assignment -> localPartitionStateByNode.partitionState(assignment.consistentId()) != null) + .min(Comparator.<Assignment>comparingLong( + node -> localPartitionStateByNode.partitionState(node.consistentId()).logIndex() + ) + .reversed() + .thenComparing(Assignment::consistentId)) + // If there are no nodes with data, we choose the node with the first consistent id in the lexicographic order. + .or(() -> assignments.stream().min(Comparator.comparing(Assignment::consistentId))); + + // TODO: IGNITE-23737 The case with no suitable nodes should be handled. + return nodeWithMaxLogIndex.orElseThrow(); + } + + /** + * Returns a modifiable set of nodes that are both alive and either {@link LocalPartitionStateEnum#HEALTHY} or + * {@link LocalPartitionStateEnum#CATCHING_UP}. + */ + private static Set<Assignment> getAliveNodesWithData( + Set<String> aliveNodesConsistentIds, + LocalPartitionStateMessageByNode localPartitionStateMessageByNode + ) { + var partAssignments = new HashSet<Assignment>(); + + for (Entry<String, LocalPartitionStateMessage> entry : localPartitionStateMessageByNode.entrySet()) { + String nodeName = entry.getKey(); + LocalPartitionStateEnum state = entry.getValue().state(); + + if (aliveNodesConsistentIds.contains(nodeName) && (state == HEALTHY || state == CATCHING_UP)) { + partAssignments.add(Assignment.forPeer(nodeName)); + } + } + + return partAssignments; + } + + /** + * Adds more nodes into {@code partAssignments} until it matches the number of replicas or we run out of nodes. + */ + private static void enrichAssignments( + PartitionGroupId partId, + Collection<String> aliveDataNodes, + int partitions, + int replicas, + Set<Assignment> partAssignments + ) { + Set<Assignment> calcAssignments = calculateAssignmentForPartition(aliveDataNodes, partId.partitionId(), partitions, replicas); + + for (Assignment calcAssignment : calcAssignments) { + if (partAssignments.size() == replicas) { + break; + } + + partAssignments.add(calcAssignment); + } + } + + abstract CompletableFuture<Map<T, LocalPartitionStateMessageByNode>> localStatesFuture( + DisasterRecoveryManager disasterRecoveryManager, + Set<String> zoneNames, + Set<Integer> partitionIds, + Catalog catalog + ); + + abstract CompletableFuture<Map<Integer, Assignments>> stableAssignments( + MetaStorageManager metaStorageManager, + int zoneId, Review Comment: bad naming, it could be table id as well -- 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: notifications-unsubscr...@ignite.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
