Skip to content

Commit d1962ec

Browse files
authored
IGNITE-24095 Remove FORCE_ADD_REASSIGNMENT_SINCE. (#11812)
1 parent bc7061e commit d1962ec

File tree

1 file changed

+3
-14
lines changed

1 file changed

+3
-14
lines changed

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java

+3-14
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,6 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
175175
private static final int RELEASE_FUTURE_DUMP_THRESHOLD = IgniteSystemProperties.getInteger(
176176
IGNITE_PARTITION_RELEASE_FUTURE_DUMP_THRESHOLD, DFLT_PARTITION_RELEASE_FUTURE_DUMP_THRESHOLD);
177177

178-
/** */
179-
private static final IgniteProductVersion FORCE_AFF_REASSIGNMENT_SINCE = IgniteProductVersion.fromString("2.4.3");
180-
181178
/**
182179
* This may be useful when per-entry (not per-cache based) partition policy is in use.
183180
* See {@link IgniteSystemProperties#IGNITE_SKIP_PARTITION_SIZE_VALIDATION} for details.
@@ -967,8 +964,7 @@ else if (firstDiscoEvt.type() == EVT_DISCOVERY_CUSTOM_EVT) {
967964

968965
DiscoveryCustomMessage msg = ((DiscoveryCustomEvent)firstDiscoEvt).customMessage();
969966

970-
forceAffReassignment = DiscoveryCustomEvent.requiresCentralizedAffinityAssignment(msg)
971-
&& firstEventCache().minimumNodeVersion().compareToIgnoreTimestamp(FORCE_AFF_REASSIGNMENT_SINCE) >= 0;
967+
forceAffReassignment = DiscoveryCustomEvent.requiresCentralizedAffinityAssignment(msg);
972968

973969
if (msg instanceof ChangeGlobalStateMessage) {
974970
assert exchActions != null && !exchActions.empty();
@@ -1412,19 +1408,12 @@ private ExchangeType onClusterStateChangeRequest(boolean crd) {
14121408
}
14131409
}
14141410
else if (req.state().active()) {
1411+
assert forceAffReassignment;
1412+
14151413
cctx.exchange().exchangerBlockingSectionBegin();
14161414

14171415
// TODO: BLT changes on inactive cluster can't be handled easily because persistent storage hasn't been initialized yet.
14181416
try {
1419-
if (!forceAffReassignment) {
1420-
// possible only if cluster contains nodes without forceAffReassignment mode
1421-
assert firstEventCache().minimumNodeVersion()
1422-
.compareToIgnoreTimestamp(FORCE_AFF_REASSIGNMENT_SINCE) < 0
1423-
: firstEventCache().minimumNodeVersion();
1424-
1425-
cctx.affinity().onBaselineTopologyChanged(this, crd);
1426-
}
1427-
14281417
if (CU.isPersistenceEnabled(kctx.config()) && !kctx.clientNode())
14291418
kctx.state().onBaselineTopologyChanged(req.baselineTopology(),
14301419
req.prevBaselineTopologyHistoryItem());

0 commit comments

Comments
 (0)