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 cae90410a3 IGNITE-19724 Remove redundant joins (#2252) cae90410a3 is described below commit cae90410a32ba3946d09f6a135683f9c3e231f38 Author: Kirill Gusakov <kgusa...@gmail.com> AuthorDate: Tue Jun 27 21:10:15 2023 +0300 IGNITE-19724 Remove redundant joins (#2252) --- .../java/org/apache/ignite/internal/replicator/ReplicaManager.java | 3 +-- .../java/org/apache/ignite/internal/rebalance/ItRebalanceTest.java | 6 +++--- .../java/org/apache/ignite/distributed/ReplicaUnavailableTest.java | 3 ++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/replicator/src/main/java/org/apache/ignite/internal/replicator/ReplicaManager.java b/modules/replicator/src/main/java/org/apache/ignite/internal/replicator/ReplicaManager.java index 61e86f7ee6..c2b1008f20 100644 --- a/modules/replicator/src/main/java/org/apache/ignite/internal/replicator/ReplicaManager.java +++ b/modules/replicator/src/main/java/org/apache/ignite/internal/replicator/ReplicaManager.java @@ -407,8 +407,7 @@ public class ReplicaManager implements IgniteComponent { if (!removed.isCompletedExceptionally()) { return removed - .join() - .shutdown() + .thenCompose(Replica::shutdown) .handle((notUsed, throwable) -> { if (throwable == null) { return true; diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceTest.java index 963a800946..baa7178279 100644 --- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceTest.java +++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceTest.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.rebalance; import static java.util.stream.Collectors.toList; import static org.apache.ignite.internal.SessionUtils.executeUpdate; import static org.apache.ignite.internal.distributionzones.rebalance.RebalanceUtil.partitionAssignments; +import static org.apache.ignite.internal.testframework.IgniteTestUtils.await; import static org.apache.ignite.internal.testframework.IgniteTestUtils.waitForCondition; import static org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willThrow; import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willBe; @@ -153,9 +154,8 @@ public class ItRebalanceTest extends IgniteIntegrationTest { assertTrue(waitForCondition(() -> { Set<String> assignments = - partitionAssignments( - cluster.aliveNode().metaStorageManager(), table, 0 - ).join().stream() + await(partitionAssignments(cluster.aliveNode().metaStorageManager(), table, 0)) + .stream() .map(Assignment::consistentId) .collect(Collectors.toSet()); diff --git a/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ReplicaUnavailableTest.java b/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ReplicaUnavailableTest.java index 006744e698..4378cac984 100644 --- a/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ReplicaUnavailableTest.java +++ b/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ReplicaUnavailableTest.java @@ -21,6 +21,7 @@ import static java.util.concurrent.CompletableFuture.completedFuture; import static org.apache.ignite.distributed.ItTxDistributedTestSingleNode.NODE_PORT_BASE; import static org.apache.ignite.distributed.ItTxDistributedTestSingleNode.startNode; import static org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willThrow; +import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willSucceedFast; import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willSucceedIn; import static org.apache.ignite.internal.util.ExceptionUtils.unwrapCause; import static org.apache.ignite.lang.ErrorGroups.Replicator.REPLICA_TIMEOUT_ERR; @@ -196,7 +197,7 @@ public class ReplicaUnavailableTest extends IgniteAbstractTest { try { log.info("Replica msg " + message.getClass().getSimpleName()); - replicaManager.stopReplica(tablePartitionId).join(); + assertThat(replicaManager.stopReplica(tablePartitionId), willSucceedFast()); } catch (NodeStoppingException e) { throw new RuntimeException(e); }