You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sk...@apache.org on 2023/09/14 11:15:50 UTC
[ignite-3] branch main updated: IGNITE-20394 ItSchemaSyncAndReplicationTest#laggingSchemasPreventPartitionDataReplication sometims fails with TimeoutException (#2587)
This is an automated email from the ASF dual-hosted git repository.
sk0x50 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new bf1bb0589f IGNITE-20394 ItSchemaSyncAndReplicationTest#laggingSchemasPreventPartitionDataReplication sometims fails with TimeoutException (#2587)
bf1bb0589f is described below
commit bf1bb0589fb295512ae75e0a2e329e8f9e604e95
Author: Alexander Lapin <la...@gmail.com>
AuthorDate: Thu Sep 14 14:15:45 2023 +0300
IGNITE-20394 ItSchemaSyncAndReplicationTest#laggingSchemasPreventPartitionDataReplication sometims fails with TimeoutException (#2587)
---
.../ignite/internal/schemasync/ItSchemaSyncAndReplicationTest.java | 2 +-
.../java/org/apache/ignite/internal/table/distributed/TableManager.java | 2 ++
.../ignite/internal/table/distributed/raft/PartitionListener.java | 2 ++
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/schemasync/ItSchemaSyncAndReplicationTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/schemasync/ItSchemaSyncAndReplicationTest.java
index 1439d68ca0..1cb820a732 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/schemasync/ItSchemaSyncAndReplicationTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/schemasync/ItSchemaSyncAndReplicationTest.java
@@ -72,7 +72,7 @@ class ItSchemaSyncAndReplicationTest extends ClusterPerTestIntegrationTest {
* cannot execute without waiting for schemas). This method tests this scenario.
*/
@Test
- @Disabled("https://issues.apache.org/jira/browse/IGNITE-20394")
+ @Disabled("https://issues.apache.org/jira/browse/IGNITE-20410")
void laggingSchemasPreventPartitionDataReplication() throws Exception {
createTestTableWith3Replicas();
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
index 66af7c86cf..111975e0bf 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
@@ -708,6 +708,8 @@ public class TableManager extends Producer<TableEvent, TableEventParameters> imp
PartitionDataStorage partitionDataStorage = partitionDataStorage(partitionStorages.getMvPartitionStorage(),
internalTbl, partId);
+ storageIndexTracker.update(partitionDataStorage.lastAppliedIndex(), null);
+
PartitionUpdateHandlers partitionUpdateHandlers = createPartitionUpdateHandlers(
partId,
partitionDataStorage,
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/PartitionListener.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/PartitionListener.java
index 61022405c2..d8b91da9f1 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/PartitionListener.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/PartitionListener.java
@@ -396,6 +396,7 @@ public class PartitionListener implements RaftGroupListener {
new RaftGroupConfiguration(config.peers(), config.learners(), config.oldPeers(), config.oldLearners())
);
storage.lastApplied(config.index(), config.term());
+ updateTrackerIgnoringTrackerClosedException(storageIndexTracker, config.index());
return null;
});
@@ -428,6 +429,7 @@ public class PartitionListener implements RaftGroupListener {
});
txStateStorage.lastApplied(maxLastAppliedIndex, maxLastAppliedTerm);
+ updateTrackerIgnoringTrackerClosedException(storageIndexTracker, maxLastAppliedIndex);
CompletableFuture.allOf(storage.flush(), txStateStorage.flush())
.whenComplete((unused, throwable) -> doneClo.accept(throwable));