sanpwc commented on code in PR #5371: URL: https://github.com/apache/ignite-3/pull/5371#discussion_r1987260798
########## modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/ItColocationTxCleanupRecoveryTest.java: ########## @@ -0,0 +1,142 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.partition.replicator; + +import static java.util.concurrent.TimeUnit.SECONDS; +import static java.util.stream.Collectors.toList; +import static org.apache.ignite.internal.TestWrappers.unwrapTableImpl; +import static org.apache.ignite.internal.testframework.IgniteTestUtils.bypassingThreadAssertions; +import static org.apache.ignite.internal.testframework.IgniteTestUtils.waitForCondition; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.List; +import java.util.UUID; +import java.util.function.Predicate; +import org.apache.ignite.internal.hlc.HybridTimestamp; +import org.apache.ignite.internal.lang.IgniteBiTuple; +import org.apache.ignite.internal.partition.replicator.fixtures.Node; +import org.apache.ignite.internal.placementdriver.ReplicaMeta; +import org.apache.ignite.internal.storage.MvPartitionStorage; +import org.apache.ignite.internal.storage.PartitionTimestampCursor; +import org.apache.ignite.internal.storage.ReadResult; +import org.apache.ignite.internal.table.InternalTable; +import org.apache.ignite.internal.tx.TxMeta; +import org.apache.ignite.internal.tx.message.TxCleanupMessage; +import org.apache.ignite.internal.tx.storage.state.TxStatePartitionStorage; +import org.apache.ignite.internal.util.Cursor; +import org.apache.ignite.table.KeyValueView; +import org.apache.ignite.tx.Transaction; +import org.junit.jupiter.api.Test; + +// TODO: remove after switching to per-zone partitions https://issues.apache.org/jira/browse/IGNITE-22522 +class ItColocationTxCleanupRecoveryTest extends ItAbstractColocationTest { + @Test + void txGetsCleanedUpOnPrimaryChange() throws Exception { + startCluster(3); + + Node node0 = cluster.get(0); + + // Create a zone with a single partition on every node. + int zoneId = createZone(node0, TEST_ZONE_NAME, 1, cluster.size()); + + createTable(node0, TEST_ZONE_NAME, TEST_TABLE_NAME1); + createTable(node0, TEST_ZONE_NAME, TEST_TABLE_NAME2); Review Comment: Is this a sort of attention test? TEST_TABLE_NAME2 isn't used)) ########## modules/transactions/src/main/java/org/apache/ignite/internal/tx/impl/TxManagerImpl.java: ########## @@ -358,21 +358,18 @@ public TxManagerImpl( new TxCleanupRequestSender(txMessageSender, placementDriverHelper, txStateVolatileStorage); } - // TODO: IGNITE-24363 - change action argument type to ReplicaGroupId. private CompletableFuture<Boolean> primaryReplicaEventListener( PrimaryReplicaEventParameters eventParameters, - Consumer<TablePartitionId> action + Consumer<ReplicationGroupId> action ) { return inBusyLock(busyLock, () -> { assertReplicationGroupType(eventParameters.groupId()); - if (!(eventParameters.groupId() instanceof TablePartitionId)) { + if (!(eventParameters.groupId() instanceof TablePartitionId) && !(eventParameters.groupId() instanceof ZonePartitionId)) { Review Comment: Could you please add a todo with https://issues.apache.org/jira/browse/IGNITE-22522 in order not to forget to remove `!(eventParameters.groupId() instanceof TablePartitionId)` after we will fully switch to colocation? ########## modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/ItColocationTxCleanupRecoveryTest.java: ########## @@ -0,0 +1,142 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.partition.replicator; + +import static java.util.concurrent.TimeUnit.SECONDS; +import static java.util.stream.Collectors.toList; +import static org.apache.ignite.internal.TestWrappers.unwrapTableImpl; +import static org.apache.ignite.internal.testframework.IgniteTestUtils.bypassingThreadAssertions; +import static org.apache.ignite.internal.testframework.IgniteTestUtils.waitForCondition; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.List; +import java.util.UUID; +import java.util.function.Predicate; +import org.apache.ignite.internal.hlc.HybridTimestamp; +import org.apache.ignite.internal.lang.IgniteBiTuple; +import org.apache.ignite.internal.partition.replicator.fixtures.Node; +import org.apache.ignite.internal.placementdriver.ReplicaMeta; +import org.apache.ignite.internal.storage.MvPartitionStorage; +import org.apache.ignite.internal.storage.PartitionTimestampCursor; +import org.apache.ignite.internal.storage.ReadResult; +import org.apache.ignite.internal.table.InternalTable; +import org.apache.ignite.internal.tx.TxMeta; +import org.apache.ignite.internal.tx.message.TxCleanupMessage; +import org.apache.ignite.internal.tx.storage.state.TxStatePartitionStorage; +import org.apache.ignite.internal.util.Cursor; +import org.apache.ignite.table.KeyValueView; +import org.apache.ignite.tx.Transaction; +import org.junit.jupiter.api.Test; + +// TODO: remove after switching to per-zone partitions https://issues.apache.org/jira/browse/IGNITE-22522 +class ItColocationTxCleanupRecoveryTest extends ItAbstractColocationTest { + @Test + void txGetsCleanedUpOnPrimaryChange() throws Exception { Review Comment: Side note: I don't think that we need such colocation specific tests any longer. Since we have proper infrastructure I'd rather adjust existing tests to run under colocation flag. In this particular case ItDurableFinishTest is a good candidate for such adjustment. -- 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
