sashapolo commented on code in PR #5258:
URL: https://github.com/apache/ignite-3/pull/5258#discussion_r1979530156
##########
modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/raft/ZonePartitionRaftListener.java:
##########
@@ -266,6 +270,10 @@ private IgniteBiTuple<Serializable, Boolean>
processCrossTableProcessorsCommand(
long commandTerm,
@Nullable HybridTimestamp safeTimestamp
) {
+ if (tableProcessors.isEmpty()) {
+ return new IgniteBiTuple<>(null, true);
Review Comment:
Shouldn't it be `false` instead? And I think this check is redundant anyway.
##########
modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/ItReplicaLifecycleTest.java:
##########
@@ -636,6 +639,54 @@ public void testScanCloseReplicaRequest() throws Exception
{
assertDoesNotThrow(tx::commit);
}
+ @Test
+ public void testReplicaSafeTimeSyncRequest() throws Exception {
+ startCluster(2);
+ Node node = getNode(0);
+
+ // Prepare a zone.
+ String zoneName = "test_zone";
+ createZone(node, zoneName, 1, 2);
+ int zoneId = DistributionZonesTestUtil.getZoneId(node.catalogManager,
zoneName, node.hybridClock.nowLong());
+ int partId = 0;
+
+ // Wait for sure that zone replication group was created on both nodes.
+ waitForZoneReplicaStartedOnNode(node, zoneId, partId);
+ waitForZoneReplicaStartedOnNode(getNode(1), zoneId, partId);
Review Comment:
Would it be enough to call `waitForMetadataCompletenessAtNow` on all nodes
instead?
##########
modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/ItReplicaLifecycleTest.java:
##########
@@ -636,6 +639,54 @@ public void testScanCloseReplicaRequest() throws Exception
{
assertDoesNotThrow(tx::commit);
}
+ @Test
+ public void testReplicaSafeTimeSyncRequest() throws Exception {
+ startCluster(2);
+ Node node = getNode(0);
+
+ // Prepare a zone.
+ String zoneName = "test_zone";
+ createZone(node, zoneName, 1, 2);
+ int zoneId = DistributionZonesTestUtil.getZoneId(node.catalogManager,
zoneName, node.hybridClock.nowLong());
+ int partId = 0;
+
+ // Wait for sure that zone replication group was created on both nodes.
+ waitForZoneReplicaStartedOnNode(node, zoneId, partId);
+ waitForZoneReplicaStartedOnNode(getNode(1), zoneId, partId);
+
+ // Check that time was adjusted even without table.
+ checkSafeTimeWasAdjustedForZoneGroup(zoneId, partId);
+
+ // Create a table to work with.
+ String tableName = "test_table";
+ createTable(node, zoneName, tableName);
+ assertDoesNotThrow(() ->
TableTestUtils.getTableIdStrict(node.catalogManager, tableName,
node.hybridClock.nowLong()));
+
+ // Check that time was adjusted table.
+ checkSafeTimeWasAdjustedForZoneGroup(zoneId, partId);
+ }
+
+ private static void waitForZoneReplicaStartedOnNode(Node node, int zoneId,
int partId) throws InterruptedException {
+ ZonePartitionId zoneReplicationId = new ZonePartitionId(zoneId,
partId);
+
+ waitForCondition(() -> node.replicaManager.replica(zoneReplicationId)
!= null, AWAIT_TIMEOUT_MILLIS);
Review Comment:
missing `assertTrue`
##########
modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/ItReplicaLifecycleTest.java:
##########
@@ -636,6 +639,54 @@ public void testScanCloseReplicaRequest() throws Exception
{
assertDoesNotThrow(tx::commit);
}
+ @Test
+ public void testReplicaSafeTimeSyncRequest() throws Exception {
+ startCluster(2);
+ Node node = getNode(0);
+
+ // Prepare a zone.
+ String zoneName = "test_zone";
+ createZone(node, zoneName, 1, 2);
+ int zoneId = DistributionZonesTestUtil.getZoneId(node.catalogManager,
zoneName, node.hybridClock.nowLong());
+ int partId = 0;
+
+ // Wait for sure that zone replication group was created on both nodes.
+ waitForZoneReplicaStartedOnNode(node, zoneId, partId);
+ waitForZoneReplicaStartedOnNode(getNode(1), zoneId, partId);
+
+ // Check that time was adjusted even without table.
+ checkSafeTimeWasAdjustedForZoneGroup(zoneId, partId);
+
+ // Create a table to work with.
+ String tableName = "test_table";
+ createTable(node, zoneName, tableName);
+ assertDoesNotThrow(() ->
TableTestUtils.getTableIdStrict(node.catalogManager, tableName,
node.hybridClock.nowLong()));
+
+ // Check that time was adjusted table.
+ checkSafeTimeWasAdjustedForZoneGroup(zoneId, partId);
+ }
+
+ private static void waitForZoneReplicaStartedOnNode(Node node, int zoneId,
int partId) throws InterruptedException {
+ ZonePartitionId zoneReplicationId = new ZonePartitionId(zoneId,
partId);
+
+ waitForCondition(() -> node.replicaManager.replica(zoneReplicationId)
!= null, AWAIT_TIMEOUT_MILLIS);
+ assertThat(node.replicaManager.replica(zoneReplicationId),
willCompleteSuccessfully());
+ }
+
+ private void checkSafeTimeWasAdjustedForZoneGroup(int zoneId, int partId)
throws InterruptedException {
Review Comment:
Can we generalize this method on a per-node basis? It looks strangely
specific that we check two nodes inside.
##########
modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/ItReplicaLifecycleTest.java:
##########
@@ -636,6 +639,54 @@ public void testScanCloseReplicaRequest() throws Exception
{
assertDoesNotThrow(tx::commit);
}
+ @Test
+ public void testReplicaSafeTimeSyncRequest() throws Exception {
+ startCluster(2);
+ Node node = getNode(0);
+
+ // Prepare a zone.
+ String zoneName = "test_zone";
+ createZone(node, zoneName, 1, 2);
+ int zoneId = DistributionZonesTestUtil.getZoneId(node.catalogManager,
zoneName, node.hybridClock.nowLong());
+ int partId = 0;
+
+ // Wait for sure that zone replication group was created on both nodes.
+ waitForZoneReplicaStartedOnNode(node, zoneId, partId);
+ waitForZoneReplicaStartedOnNode(getNode(1), zoneId, partId);
+
+ // Check that time was adjusted even without table.
+ checkSafeTimeWasAdjustedForZoneGroup(zoneId, partId);
+
+ // Create a table to work with.
+ String tableName = "test_table";
+ createTable(node, zoneName, tableName);
+ assertDoesNotThrow(() ->
TableTestUtils.getTableIdStrict(node.catalogManager, tableName,
node.hybridClock.nowLong()));
+
+ // Check that time was adjusted table.
+ checkSafeTimeWasAdjustedForZoneGroup(zoneId, partId);
+ }
+
+ private static void waitForZoneReplicaStartedOnNode(Node node, int zoneId,
int partId) throws InterruptedException {
+ ZonePartitionId zoneReplicationId = new ZonePartitionId(zoneId,
partId);
+
+ waitForCondition(() -> node.replicaManager.replica(zoneReplicationId)
!= null, AWAIT_TIMEOUT_MILLIS);
+ assertThat(node.replicaManager.replica(zoneReplicationId),
willCompleteSuccessfully());
+ }
+
+ private void checkSafeTimeWasAdjustedForZoneGroup(int zoneId, int partId)
throws InterruptedException {
+ Node node0 = getNode(0);
+ Node node1 = getNode(1);
+
+ HybridTimestamp node0safeTimeBefore =
node0.currentSafeTimeForZonePartition(zoneId, partId);
+ HybridTimestamp node1safeTimeBefore =
node1.currentSafeTimeForZonePartition(zoneId, partId);
+
+ waitForCondition(
Review Comment:
missing `assertTrue`
##########
modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/ItReplicaLifecycleTest.java:
##########
@@ -636,6 +639,54 @@ public void testScanCloseReplicaRequest() throws Exception
{
assertDoesNotThrow(tx::commit);
}
+ @Test
+ public void testReplicaSafeTimeSyncRequest() throws Exception {
+ startCluster(2);
+ Node node = getNode(0);
+
+ // Prepare a zone.
+ String zoneName = "test_zone";
+ createZone(node, zoneName, 1, 2);
+ int zoneId = DistributionZonesTestUtil.getZoneId(node.catalogManager,
zoneName, node.hybridClock.nowLong());
+ int partId = 0;
+
+ // Wait for sure that zone replication group was created on both nodes.
+ waitForZoneReplicaStartedOnNode(node, zoneId, partId);
+ waitForZoneReplicaStartedOnNode(getNode(1), zoneId, partId);
+
+ // Check that time was adjusted even without table.
+ checkSafeTimeWasAdjustedForZoneGroup(zoneId, partId);
+
+ // Create a table to work with.
+ String tableName = "test_table";
+ createTable(node, zoneName, tableName);
+ assertDoesNotThrow(() ->
TableTestUtils.getTableIdStrict(node.catalogManager, tableName,
node.hybridClock.nowLong()));
Review Comment:
Why is this needed?
##########
modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/ItReplicaLifecycleTest.java:
##########
@@ -636,6 +639,54 @@ public void testScanCloseReplicaRequest() throws Exception
{
assertDoesNotThrow(tx::commit);
}
+ @Test
+ public void testReplicaSafeTimeSyncRequest() throws Exception {
+ startCluster(2);
+ Node node = getNode(0);
+
+ // Prepare a zone.
+ String zoneName = "test_zone";
+ createZone(node, zoneName, 1, 2);
+ int zoneId = DistributionZonesTestUtil.getZoneId(node.catalogManager,
zoneName, node.hybridClock.nowLong());
+ int partId = 0;
+
+ // Wait for sure that zone replication group was created on both nodes.
+ waitForZoneReplicaStartedOnNode(node, zoneId, partId);
+ waitForZoneReplicaStartedOnNode(getNode(1), zoneId, partId);
+
+ // Check that time was adjusted even without table.
+ checkSafeTimeWasAdjustedForZoneGroup(zoneId, partId);
+
+ // Create a table to work with.
+ String tableName = "test_table";
+ createTable(node, zoneName, tableName);
+ assertDoesNotThrow(() ->
TableTestUtils.getTableIdStrict(node.catalogManager, tableName,
node.hybridClock.nowLong()));
+
+ // Check that time was adjusted table.
Review Comment:
Something is not right with this sentence
##########
modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/ItReplicaLifecycleTest.java:
##########
@@ -636,6 +639,54 @@ public void testScanCloseReplicaRequest() throws Exception
{
assertDoesNotThrow(tx::commit);
}
+ @Test
+ public void testReplicaSafeTimeSyncRequest() throws Exception {
+ startCluster(2);
+ Node node = getNode(0);
+
+ // Prepare a zone.
+ String zoneName = "test_zone";
+ createZone(node, zoneName, 1, 2);
+ int zoneId = DistributionZonesTestUtil.getZoneId(node.catalogManager,
zoneName, node.hybridClock.nowLong());
+ int partId = 0;
+
+ // Wait for sure that zone replication group was created on both nodes.
+ waitForZoneReplicaStartedOnNode(node, zoneId, partId);
+ waitForZoneReplicaStartedOnNode(getNode(1), zoneId, partId);
+
+ // Check that time was adjusted even without table.
Review Comment:
```suggestion
// Check that time was adjusted even without tables.
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@ignite.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
