This is an automated email from the ASF dual-hosted git repository.
wernerdv 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 39d2c0112fd IGNITE-29232 Fix continuous query backup ack not sent to
all backups (#13773)
39d2c0112fd is described below
commit 39d2c0112fd7fec0a5407f41b2eba52f5f012afa
Author: Dmitry Werner <[email protected]>
AuthorDate: Thu Nov 5 01:04:27 2026 +0800
IGNITE-29232 Fix continuous query backup ack not sent to all backups
(#13773)
---
.../continuous/CacheContinuousQueryHandler.java | 2 +-
.../continuous/TestCacheContinuousQueryUtils.java | 6 +++++
.../ContinuousQueryBuffersCleanupTest.java | 27 ++++++++++++++++++++++
3 files changed, 34 insertions(+), 1 deletion(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
index b42c353ceb8..204f9f76eb3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java
@@ -1543,7 +1543,7 @@ public final class CacheContinuousQueryHandler<K, V>
extends AbstractMessage imp
for (ClusterNode node :
ctx.discovery().cacheGroupAffinityNodes(cctx.groupId(), topVer)) {
if (!node.isLocal()) {
// Try to send the same message only once
per node.
- if (sentToNodes != null &&
!sentToNodes.add(nodeId))
+ if (sentToNodes != null &&
!sentToNodes.add(node.id()))
continue;
try {
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/TestCacheContinuousQueryUtils.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/TestCacheContinuousQueryUtils.java
index 61d1bfba4ca..a4389d01609 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/TestCacheContinuousQueryUtils.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/TestCacheContinuousQueryUtils.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.processors.cache.query.continuous;
import java.util.Map;
+import org.apache.ignite.internal.processors.timeout.GridTimeoutProcessor;
import org.apache.ignite.internal.util.GridAtomicLong;
/** */
@@ -43,4 +44,9 @@ public class TestCacheContinuousQueryUtils {
public static GridAtomicLong
maxReceivedBackupAcknowledgeUpdateCounter(CacheContinuousQueryEventBuffer buf) {
return buf.maxReceivedBackupAckUpdCntr;
}
+
+ /** */
+ public static GridTimeoutProcessor.CancelableTask
cancelableTask(CacheContinuousQueryManager<?, ?> mgr) {
+ return mgr.getCancelableTask();
+ }
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/ContinuousQueryBuffersCleanupTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/ContinuousQueryBuffersCleanupTest.java
index 8f453ca4a87..c3dfbb6a70f 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/ContinuousQueryBuffersCleanupTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/ContinuousQueryBuffersCleanupTest.java
@@ -56,6 +56,7 @@ import static
org.apache.ignite.internal.processors.cache.distributed.GridCacheM
import static
org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryHandler.DFLT_CONTINUOUS_QUERY_BACKUP_ACK_THRESHOLD;
import static
org.apache.ignite.internal.processors.cache.query.continuous.TestCacheContinuousQueryUtils.backupQueueSize;
import static
org.apache.ignite.internal.processors.cache.query.continuous.TestCacheContinuousQueryUtils.bufferedEntries;
+import static
org.apache.ignite.internal.processors.cache.query.continuous.TestCacheContinuousQueryUtils.cancelableTask;
import static
org.apache.ignite.internal.processors.cache.query.continuous.TestCacheContinuousQueryUtils.maxReceivedBackupAcknowledgeUpdateCounter;
import static
org.apache.ignite.internal.processors.cache.query.continuous.TestCacheContinuousQueryUtils.partitionContinuesQueryEntryBuffers;
import static org.apache.ignite.testframework.GridTestUtils.waitForCondition;
@@ -146,6 +147,32 @@ public class ContinuousQueryBuffersCleanupTest extends
GridCommonAbstractTest {
}
}
+ /** Checks that a backup acknowledgement covering several topology
versions is sent to all backups. */
+ @Test
+ public void testBackupAcknowledgeCoveringSeveralTopologyVersions() throws
Exception {
+ startGrids(3);
+
+ // Keys of the first node are in one partition, so backup CQ buffer
exists before the acknowledgement.
+ IgniteCache<Object, Object> cache = grid(0).createCache(new
CacheConfiguration<>(DEFAULT_CACHE_NAME)
+ .setAffinity(new GridCacheModuloAffinityFunction(3, 2))
+ .setWriteSynchronizationMode(FULL_SYNC)
+ .setBackups(2));
+
+ // Disable acknowledgement by timeout, so the single acknowledgement
covers both topology versions.
+
cancelableTask(grid(0).cachex(DEFAULT_CACHE_NAME).context().continuousQueries()).close();
+
+ try (QueryCursor<?> ignored = cache.query(new
ContinuousQuery<>().setLocalListener(evts -> {}))) {
+ for (int i = 0; i < DFLT_CONTINUOUS_QUERY_BACKUP_ACK_THRESHOLD;
i++) {
+ if (i == DFLT_CONTINUOUS_QUERY_BACKUP_ACK_THRESHOLD / 2)
+ startClientGrid(3);
+
+ cache.put(keyForNode(grid(0)), i);
+ }
+
+ assertTrue(waitForCondition(() ->
G.allGrids().stream().allMatch(this::isContinuesQueryBufferEmpty), 5_000));
+ }
+ }
+
/** */
private void checkBuffersCleared(int primaryNodeIdx, Function<Query<?>,
QueryCursor<?>> queryExecutor) throws Exception {
IgniteEx primary = grid(primaryNodeIdx);