You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ni...@apache.org on 2025/01/22 07:47:03 UTC
(ignite) branch master updated: IGNITE-24095 Remove FORCE_ADD_REASSIGNMENT_SINCE. (#11812)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new d1962ecdcd3 IGNITE-24095 Remove FORCE_ADD_REASSIGNMENT_SINCE. (#11812)
d1962ecdcd3 is described below
commit d1962ecdcd3e840195da29ab51fe315664e89e5e
Author: Vladislav Novikov <47...@users.noreply.github.com>
AuthorDate: Wed Jan 22 10:46:56 2025 +0300
IGNITE-24095 Remove FORCE_ADD_REASSIGNMENT_SINCE. (#11812)
---
.../dht/preloader/GridDhtPartitionsExchangeFuture.java | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index eb63bde4d94..9a8d610d171 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -175,9 +175,6 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
private static final int RELEASE_FUTURE_DUMP_THRESHOLD = IgniteSystemProperties.getInteger(
IGNITE_PARTITION_RELEASE_FUTURE_DUMP_THRESHOLD, DFLT_PARTITION_RELEASE_FUTURE_DUMP_THRESHOLD);
- /** */
- private static final IgniteProductVersion FORCE_AFF_REASSIGNMENT_SINCE = IgniteProductVersion.fromString("2.4.3");
-
/**
* This may be useful when per-entry (not per-cache based) partition policy is in use.
* See {@link IgniteSystemProperties#IGNITE_SKIP_PARTITION_SIZE_VALIDATION} for details.
@@ -967,8 +964,7 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
DiscoveryCustomMessage msg = ((DiscoveryCustomEvent)firstDiscoEvt).customMessage();
- forceAffReassignment = DiscoveryCustomEvent.requiresCentralizedAffinityAssignment(msg)
- && firstEventCache().minimumNodeVersion().compareToIgnoreTimestamp(FORCE_AFF_REASSIGNMENT_SINCE) >= 0;
+ forceAffReassignment = DiscoveryCustomEvent.requiresCentralizedAffinityAssignment(msg);
if (msg instanceof ChangeGlobalStateMessage) {
assert exchActions != null && !exchActions.empty();
@@ -1412,19 +1408,12 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
}
}
else if (req.state().active()) {
+ assert forceAffReassignment;
+
cctx.exchange().exchangerBlockingSectionBegin();
// TODO: BLT changes on inactive cluster can't be handled easily because persistent storage hasn't been initialized yet.
try {
- if (!forceAffReassignment) {
- // possible only if cluster contains nodes without forceAffReassignment mode
- assert firstEventCache().minimumNodeVersion()
- .compareToIgnoreTimestamp(FORCE_AFF_REASSIGNMENT_SINCE) < 0
- : firstEventCache().minimumNodeVersion();
-
- cctx.affinity().onBaselineTopologyChanged(this, crd);
- }
-
if (CU.isPersistenceEnabled(kctx.config()) && !kctx.clientNode())
kctx.state().onBaselineTopologyChanged(req.baselineTopology(),
req.prevBaselineTopologyHistoryItem());