You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sa...@apache.org on 2023/09/04 08:02:22 UTC
[ignite-3] branch main updated: IGNITE-20319 MultiActorPlacementDriverTest and PlacementDriverManagerTest incorrectly share hybridClock (#2536)
This is an automated email from the ASF dual-hosted git repository.
sanpwc 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 2808a7c3d7 IGNITE-20319 MultiActorPlacementDriverTest and PlacementDriverManagerTest incorrectly share hybridClock (#2536)
2808a7c3d7 is described below
commit 2808a7c3d7105afe7c61e04c9b4169fdf8f0009f
Author: Alexander Lapin <la...@gmail.com>
AuthorDate: Mon Sep 4 11:02:16 2023 +0300
IGNITE-20319 MultiActorPlacementDriverTest and PlacementDriverManagerTest incorrectly share hybridClock (#2536)
---
.../internal/placementdriver/MultiActorPlacementDriverTest.java | 4 +---
.../internal/placementdriver/PlacementDriverManagerTest.java | 9 ++++-----
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/MultiActorPlacementDriverTest.java b/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/MultiActorPlacementDriverTest.java
index aafcda5cfa..b1620f40bf 100644
--- a/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/MultiActorPlacementDriverTest.java
+++ b/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/MultiActorPlacementDriverTest.java
@@ -87,8 +87,6 @@ public class MultiActorPlacementDriverTest extends BasePlacementDriverTest {
private static final PlacementDriverMessagesFactory PLACEMENT_DRIVER_MESSAGES_FACTORY = new PlacementDriverMessagesFactory();
- private final HybridClock clock = new HybridClockImpl();
-
@InjectConfiguration
private RaftConfiguration raftConfiguration;
@@ -285,7 +283,7 @@ public class MultiActorPlacementDriverTest extends BasePlacementDriverTest {
logicalTopologyService,
raftManager,
topologyAwareRaftGroupServiceFactory,
- clock
+ nodeClock
);
vaultManager.start();
diff --git a/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/PlacementDriverManagerTest.java b/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/PlacementDriverManagerTest.java
index 38dc455d7c..ee4db86945 100644
--- a/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/PlacementDriverManagerTest.java
+++ b/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/PlacementDriverManagerTest.java
@@ -98,7 +98,7 @@ public class PlacementDriverManagerTest extends BasePlacementDriverTest {
/** Another node name. The node name is matched to {@code anotherClusterService}. */
private String anotherNodeName;
- private HybridClock clock = new HybridClockImpl();
+ private HybridClock nodeClock = new HybridClockImpl();
private VaultManager vaultManager;
@@ -168,7 +168,6 @@ public class PlacementDriverManagerTest extends BasePlacementDriverTest {
eventsClientListener
);
- HybridClock nodeClock = new HybridClockImpl();
raftManager = new Loza(
clusterService,
raftConfiguration,
@@ -201,7 +200,7 @@ public class PlacementDriverManagerTest extends BasePlacementDriverTest {
logicalTopologyService,
raftManager,
topologyAwareRaftGroupServiceFactory,
- clock
+ nodeClock
);
vaultManager.start();
@@ -309,7 +308,7 @@ public class PlacementDriverManagerTest extends BasePlacementDriverTest {
Lease lease = leaseFromBytes(fut.join().value(), grpPart0);
- return lease.getExpirationTime().compareTo(clock.now()) < 0;
+ return lease.getExpirationTime().compareTo(nodeClock.now()) < 0;
}, 10_000));
@@ -322,7 +321,7 @@ public class PlacementDriverManagerTest extends BasePlacementDriverTest {
Lease lease = leaseFromBytes(fut.join().value(), grpPart0);
- return lease.getExpirationTime().compareTo(clock.now()) > 0;
+ return lease.getExpirationTime().compareTo(nodeClock.now()) > 0;
}, 10_000));
}