This is an automated email from the ASF dual-hosted git repository.
apolovtsev 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 b9c1c23b0b IGNITE-20935 Remove MetaStorageManagerImpl#getService
(#2862)
b9c1c23b0b is described below
commit b9c1c23b0b1a03103f4b628c75e4713f51b210b8
Author: Alexander Polovtcev <[email protected]>
AuthorDate: Thu Nov 23 09:47:14 2023 +0200
IGNITE-20935 Remove MetaStorageManagerImpl#getService (#2862)
---
.../org/apache/ignite/internal/index/IndexManagerTest.java | 5 ++++-
.../ignite/internal/index/TestIndexManagementUtils.java | 4 +++-
.../metastorage/impl/ItMetaStorageManagerImplTest.java | 14 ++------------
.../impl/ItMetaStorageMultipleNodesAbstractTest.java | 4 ++--
.../internal/metastorage/impl/MetaStorageManagerImpl.java | 12 +-----------
.../placementdriver/MultiActorPlacementDriverTest.java | 12 +++++++++---
6 files changed, 21 insertions(+), 30 deletions(-)
diff --git
a/modules/index/src/test/java/org/apache/ignite/internal/index/IndexManagerTest.java
b/modules/index/src/test/java/org/apache/ignite/internal/index/IndexManagerTest.java
index d146da3172..101d8ba00b 100644
---
a/modules/index/src/test/java/org/apache/ignite/internal/index/IndexManagerTest.java
+++
b/modules/index/src/test/java/org/apache/ignite/internal/index/IndexManagerTest.java
@@ -61,6 +61,7 @@ import org.apache.ignite.internal.hlc.HybridClock;
import org.apache.ignite.internal.hlc.HybridClockImpl;
import org.apache.ignite.internal.manager.IgniteComponent;
import org.apache.ignite.internal.metastorage.impl.MetaStorageManagerImpl;
+import org.apache.ignite.internal.metastorage.impl.MetaStorageService;
import
org.apache.ignite.internal.metastorage.impl.StandaloneMetaStorageManager;
import
org.apache.ignite.internal.metastorage.server.SimpleInMemoryKeyValueStorage;
import org.apache.ignite.internal.schema.SchemaManager;
@@ -232,7 +233,9 @@ public class IndexManagerTest extends
BaseIgniteAbstractTest {
}
private CompletableFuture<MvTableStorage>
getMvTableStorageLatestRevision(int tableId) {
- return
metaStorageManager.getService().currentRevision().thenCompose(latestRevision ->
getMvTableStorage(latestRevision, tableId));
+ return metaStorageManager.metaStorageService()
+ .thenCompose(MetaStorageService::currentRevision)
+ .thenCompose(latestRevision ->
getMvTableStorage(latestRevision, tableId));
}
private CompletableFuture<MvTableStorage> getMvTableStorage(long
causalityToken, int tableId) {
diff --git
a/modules/index/src/test/java/org/apache/ignite/internal/index/TestIndexManagementUtils.java
b/modules/index/src/test/java/org/apache/ignite/internal/index/TestIndexManagementUtils.java
index a44f789c34..e352801dfe 100644
---
a/modules/index/src/test/java/org/apache/ignite/internal/index/TestIndexManagementUtils.java
+++
b/modules/index/src/test/java/org/apache/ignite/internal/index/TestIndexManagementUtils.java
@@ -42,6 +42,7 @@ import org.apache.ignite.internal.lang.ByteArray;
import org.apache.ignite.internal.metastorage.Entry;
import org.apache.ignite.internal.metastorage.MetaStorageManager;
import org.apache.ignite.internal.metastorage.impl.MetaStorageManagerImpl;
+import org.apache.ignite.internal.metastorage.impl.MetaStorageService;
import org.apache.ignite.internal.placementdriver.ReplicaMeta;
import org.apache.ignite.internal.placementdriver.leases.Lease;
import org.apache.ignite.internal.replicator.TablePartitionId;
@@ -102,7 +103,8 @@ class TestIndexManagementUtils {
static void
awaitTillGlobalMetastoreRevisionIsApplied(MetaStorageManagerImpl
metaStorageManager) throws Exception {
assertTrue(
waitForCondition(() -> {
- CompletableFuture<Long> currentRevisionFuture =
metaStorageManager.getService().currentRevision();
+ CompletableFuture<Long> currentRevisionFuture =
metaStorageManager.metaStorageService()
+ .thenCompose(MetaStorageService::currentRevision);
assertThat(currentRevisionFuture,
willCompleteSuccessfully());
diff --git
a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageManagerImplTest.java
b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageManagerImplTest.java
index 17a6948b15..a02dfcd78b 100644
---
a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageManagerImplTest.java
+++
b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageManagerImplTest.java
@@ -195,19 +195,9 @@ public class ItMetaStorageManagerImplTest extends
IgniteAbstractTest {
assertThat(actualKeysFuture, will(contains(key1.bytes(), key2.bytes(),
key3.bytes())));
}
- private static class NoOpListener implements WatchListener {
- @Override
- public CompletableFuture<Void> onUpdate(WatchEvent event) {
- return completedFuture(null);
- }
-
- @Override
- public void onError(Throwable e) {}
- }
-
@Test
void testMetaStorageStopClosesRaftService() throws Exception {
- MetaStorageServiceImpl svc =
metaStorageManager.metaStorageServiceFuture().join();
+ MetaStorageServiceImpl svc =
metaStorageManager.metaStorageService().join();
metaStorageManager.stop();
@@ -244,7 +234,7 @@ public class ItMetaStorageManagerImplTest extends
IgniteAbstractTest {
// stop method.
cmgFut.complete(msNodes);
- assertThat(metaStorageManager.metaStorageServiceFuture(),
willThrowFast(CancellationException.class));
+ assertThat(metaStorageManager.metaStorageService(),
willThrowFast(CancellationException.class));
}
@Test
diff --git
a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageMultipleNodesAbstractTest.java
b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageMultipleNodesAbstractTest.java
index 864a084638..b66bffdd01 100644
---
a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageMultipleNodesAbstractTest.java
+++
b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/impl/ItMetaStorageMultipleNodesAbstractTest.java
@@ -240,7 +240,7 @@ public abstract class
ItMetaStorageMultipleNodesAbstractTest extends IgniteAbstr
CompletableFuture<Set<String>> getMetaStorageLearners() {
return metaStorageManager
- .metaStorageServiceFuture()
+ .metaStorageService()
.thenApply(MetaStorageServiceImpl::raftGroupService)
.thenCompose(service ->
service.refreshMembers(false).thenApply(v -> service.learners()))
.thenApply(learners ->
learners.stream().map(Peer::consistentId).collect(toSet()));
@@ -623,7 +623,7 @@ public abstract class
ItMetaStorageMultipleNodesAbstractTest extends IgniteAbstr
}
private RaftGroupService getMetastorageService(Node node) {
- CompletableFuture<RaftGroupService> future =
node.metaStorageManager.metaStorageServiceFuture()
+ CompletableFuture<RaftGroupService> future =
node.metaStorageManager.metaStorageService()
.thenApply(MetaStorageServiceImpl::raftGroupService);
assertThat(future, willCompleteSuccessfully());
diff --git
a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/impl/MetaStorageManagerImpl.java
b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/impl/MetaStorageManagerImpl.java
index 8c429b01af..4474bb45e6 100644
---
a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/impl/MetaStorageManagerImpl.java
+++
b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/impl/MetaStorageManagerImpl.java
@@ -882,7 +882,7 @@ public class MetaStorageManagerImpl implements
MetaStorageManager {
}
@TestOnly
- CompletableFuture<MetaStorageServiceImpl> metaStorageServiceFuture() {
+ public CompletableFuture<MetaStorageServiceImpl> metaStorageService() {
return metaStorageSvcFut;
}
@@ -912,16 +912,6 @@ public class MetaStorageManagerImpl implements
MetaStorageManager {
}
}
- /**
- * Gets Meta storage service for test purpose.
- *
- * @return Meta storage service.
- */
- @TestOnly
- public MetaStorageServiceImpl getService() {
- return metaStorageSvcFut.join();
- }
-
@Override
public void registerRevisionUpdateListener(RevisionUpdateListener
listener) {
storage.registerRevisionUpdateListener(listener);
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 d314e2e8bd..eacbbbdcbb 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
@@ -49,6 +49,7 @@ import org.apache.ignite.internal.lang.IgniteTriFunction;
import org.apache.ignite.internal.metastorage.Entry;
import
org.apache.ignite.internal.metastorage.configuration.MetaStorageConfiguration;
import org.apache.ignite.internal.metastorage.impl.MetaStorageManagerImpl;
+import org.apache.ignite.internal.metastorage.impl.MetaStorageServiceImpl;
import
org.apache.ignite.internal.metastorage.server.SimpleInMemoryKeyValueStorage;
import org.apache.ignite.internal.metastorage.server.raft.MetastorageGroupId;
import
org.apache.ignite.internal.placementdriver.PlacementDriverManagerTest.LogicalTopologyServiceTestImpl;
@@ -331,9 +332,14 @@ public class MultiActorPlacementDriverTest extends
BasePlacementDriverTest {
Lease lease = checkLeaseCreated(grpPart0, true);
- RaftGroupService msRaftClient =
metaStorageManager.getService().raftGroupService();
+ CompletableFuture<RaftGroupService> msRaftClientFuture =
metaStorageManager.metaStorageService()
+ .thenApply(MetaStorageServiceImpl::raftGroupService);
- msRaftClient.refreshLeader().join();
+ assertThat(msRaftClientFuture, willCompleteSuccessfully());
+
+ RaftGroupService msRaftClient = msRaftClientFuture.join();
+
+ assertThat(msRaftClient.refreshLeader(), willCompleteSuccessfully());
Peer previousLeader = msRaftClient.leader();
@@ -341,7 +347,7 @@ public class MultiActorPlacementDriverTest extends
BasePlacementDriverTest {
log.info("The placement driver group active actor is transferring
[from={}, to={}]", previousLeader, newLeader);
- msRaftClient.transferLeadership(newLeader).get();
+ assertThat(msRaftClient.transferLeadership(newLeader),
willCompleteSuccessfully());
waitForProlong(grpPart0, lease);
