This is an automated email from the ASF dual-hosted git repository.
NSAmelchev 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 22a21b4a7af IGNITE-28622 Remove
SnapshotStartDiscoveryMessage#needAssignPartitions (#13088)
22a21b4a7af is described below
commit 22a21b4a7af2c4dcb58f954a3f78e4dd75a82e43
Author: Dmitry Werner <[email protected]>
AuthorDate: Wed Apr 29 20:12:50 2026 +0500
IGNITE-28622 Remove SnapshotStartDiscoveryMessage#needAssignPartitions
(#13088)
---
.../internal/events/DiscoveryCustomEvent.java | 7 ++---
.../dht/preloader/GridDhtPartitionDemander.java | 9 -------
.../preloader/GridDhtPartitionsExchangeFuture.java | 31 ----------------------
.../dht/preloader/GridDhtPreloader.java | 5 ++--
.../dht/preloader/GridDhtPreloaderAssignments.java | 14 +---------
.../snapshot/SnapshotStartDiscoveryMessage.java | 5 ----
6 files changed, 5 insertions(+), 66 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/events/DiscoveryCustomEvent.java
b/modules/core/src/main/java/org/apache/ignite/internal/events/DiscoveryCustomEvent.java
index 739c94a84f6..36158880552 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/events/DiscoveryCustomEvent.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/events/DiscoveryCustomEvent.java
@@ -112,11 +112,8 @@ public class DiscoveryCustomEvent extends DiscoveryEvent {
if (msg instanceof ChangeGlobalStateMessage &&
((ChangeGlobalStateMessage)msg).activate())
return true;
- if (msg instanceof SnapshotStartDiscoveryMessage) {
- SnapshotStartDiscoveryMessage snapMsg =
(SnapshotStartDiscoveryMessage)msg;
-
- return snapMsg.needExchange() && snapMsg.needAssignPartitions();
- }
+ if (msg instanceof SnapshotStartDiscoveryMessage)
+ return false;
if (msg instanceof DynamicCacheChangeBatch) {
DynamicCacheChangeBatch cacheMsg = (DynamicCacheChangeBatch)msg;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
index 3c9660c212e..640dc953e69 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
@@ -1661,15 +1661,6 @@ public class GridDhtPartitionDemander {
return false;
}
- if (newAssignments.affinityReassign()) {
- if (log.isDebugEnabled())
- log.debug("Some of owned partitions were reassigned by
coordinator [grp="
- + grp.cacheOrGroupName() + ", " + ", init=" + topVer +
- ", other=" + newAssignments.topologyVersion() + ']');
-
- return false;
- }
-
Set<Integer> p0 = new HashSet<>();
Set<Integer> p1 = new HashSet<>();
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 50c3286208f..733f9b0adc4 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
@@ -398,9 +398,6 @@ public class GridDhtPartitionsExchangeFuture extends
GridDhtTopologyFutureAdapte
/** This future finished with 'cluster is fully rebalanced' state. */
private volatile boolean rebalanced;
- /** Some of owned by affinity partitions were changed state to moving on
this exchange. */
- private volatile boolean affinityReassign;
-
/** Tracing span. */
private Span span = NoopSpan.INSTANCE;
@@ -3824,12 +3821,6 @@ public class GridDhtPartitionsExchangeFuture extends
GridDhtTopologyFutureAdapte
finalizePartitionCounters();
}
}
- else if (discoveryCustomMsg instanceof
SnapshotStartDiscoveryMessage
- &&
((SnapshotStartDiscoveryMessage)discoveryCustomMsg).needAssignPartitions()) {
- markAffinityReassign();
-
- assignPartitionsStates(null);
- }
}
else if (exchCtx.events().hasServerJoin())
assignPartitionsStates(null);
@@ -4633,14 +4624,6 @@ public class GridDhtPartitionsExchangeFuture extends
GridDhtTopologyFutureAdapte
if (stateChangeExchange() && !F.isEmpty(msg.getErrorsMap()))
cctx.kernalContext().state().onStateChangeError(msg.getErrorsMap(),
exchActions.stateChangeRequest());
- if (firstDiscoEvt.type() == EVT_DISCOVERY_CUSTOM_EVT) {
- DiscoveryCustomMessage discoveryCustomMsg =
((DiscoveryCustomEvent)firstDiscoEvt).customMessage();
-
- if (discoveryCustomMsg instanceof SnapshotStartDiscoveryMessage
- &&
((SnapshotStartDiscoveryMessage)discoveryCustomMsg).needAssignPartitions())
- markAffinityReassign();
- }
-
onDone(resTopVer, null);
}
catch (IgniteCheckedException e) {
@@ -5263,20 +5246,6 @@ public class GridDhtPartitionsExchangeFuture extends
GridDhtTopologyFutureAdapte
markRebalanced();
}
- /**
- * Marks this future as affinity reassign.
- */
- public void markAffinityReassign() {
- affinityReassign = true;
- }
-
- /**
- * @return True if some owned partition was reassigned, false otherwise.
- */
- public boolean affinityReassign() {
- return affinityReassign;
- }
-
/**
* Add or merge updates received from coordinator while exchange in
progress.
*
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
index ccba94eacda..ef2ecff0edc 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
@@ -178,7 +178,7 @@ public class GridDhtPreloader extends
GridCachePreloaderAdapter {
GridDhtPartitionTopology top = grp.topology();
if (!grp.rebalanceEnabled())
- return new GridDhtPreloaderAssignments(exchId,
top.readyTopologyVersion(), false);
+ return new GridDhtPreloaderAssignments(exchId,
top.readyTopologyVersion());
int partitions = grp.affinity().partitions();
@@ -193,8 +193,7 @@ public class GridDhtPreloader extends
GridCachePreloaderAdapter {
", grp=" + grp.name() +
", topVer=" + top.readyTopologyVersion() + ']';
- GridDhtPreloaderAssignments assignments = new
GridDhtPreloaderAssignments(exchId, topVer,
- exchFut != null && exchFut.affinityReassign());
+ GridDhtPreloaderAssignments assignments = new
GridDhtPreloaderAssignments(exchId, topVer);
AffinityAssignment aff = grp.affinity().cachedAffinity(topVer);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloaderAssignments.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloaderAssignments.java
index 73fbce85dee..121c09fc0ed 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloaderAssignments.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloaderAssignments.java
@@ -45,31 +45,19 @@ public class GridDhtPreloaderAssignments extends
ConcurrentHashMap<ClusterNode,
/** */
private boolean cancelled;
- /** Some of owned by affinity partitions were changed state to moving. */
- private final boolean affinityReassign;
-
/**
* @param exchangeId Exchange ID.
* @param topVer Last join order.
*/
public GridDhtPreloaderAssignments(
GridDhtPartitionExchangeId exchangeId,
- AffinityTopologyVersion topVer,
- boolean affinityReassign
+ AffinityTopologyVersion topVer
) {
assert exchangeId != null;
assert topVer.topologyVersion() > 0 : topVer;
this.exchangeId = exchangeId;
this.topVer = topVer;
- this.affinityReassign = affinityReassign;
- }
-
- /**
- * @return True if partitions were reassigned.
- */
- public boolean affinityReassign() {
- return affinityReassign;
}
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotStartDiscoveryMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotStartDiscoveryMessage.java
index a16d88e9ac5..98400058e1f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotStartDiscoveryMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotStartDiscoveryMessage.java
@@ -55,11 +55,6 @@ public class SnapshotStartDiscoveryMessage extends
InitMessage<SnapshotOperation
return needExchange;
}
- /** */
- public boolean needAssignPartitions() {
- return false;
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(SnapshotStartDiscoveryMessage.class, this,
super.toString());
