[incubator-ratis] branch master updated: RATIS-1227. RaftServerRpcWithProxy constructor and the abstract impl methods should be protected. (#345)

[ru...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

runzhiwang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ratis.git


The following commit(s) were added to refs/heads/master by this push:
     new b305a4a  RATIS-1227. RaftServerRpcWithProxy constructor and the abstract impl methods should be protected. (#345)
b305a4a is described below

commit b305a4a580084244fb822ca19ca721f009afcc15
Author: Tsz-Wo Nicholas Sze <sz...@apache.org>
AuthorDate: Thu Dec 10 13:32:38 2020 +0800

    RATIS-1227. RaftServerRpcWithProxy constructor and the abstract impl methods should be protected. (#345)
---
 .../examples/arithmetic/TestArithmeticLogDump.java |  3 +--
 .../ratis/server/RaftServerRpcWithProxy.java       | 14 +++++++++-----
 .../apache/ratis/server/impl/RaftServerProxy.java  |  2 +-
 .../ratis/InstallSnapshotNotificationTests.java    |  2 +-
 .../java/org/apache/ratis/LogAppenderTests.java    |  4 ++--
 .../ratis/server/impl/GroupManagementBaseTest.java |  2 +-
 .../apache/ratis/server/impl/MiniRaftCluster.java  |  4 ++++
 .../server/impl/RaftReconfigurationBaseTest.java   |  6 +++---
 .../ratis/server/impl/RaftServerTestUtil.java      | 13 -------------
 .../server/impl/TestRatisServerMetricsBase.java    |  2 +-
 .../ratis/statemachine/RaftSnapshotBaseTest.java   |  4 ++--
 .../ratis/TestRaftServerSlownessDetection.java     |  2 +-
 .../apache/ratis/grpc/TestRaftServerWithGrpc.java  | 22 +++++++---------------
 .../apache/ratis/server/ServerRestartTests.java    |  2 +-
 14 files changed, 34 insertions(+), 48 deletions(-)

diff --git a/ratis-examples/src/test/java/org/apache/ratis/examples/arithmetic/TestArithmeticLogDump.java b/ratis-examples/src/test/java/org/apache/ratis/examples/arithmetic/TestArithmeticLogDump.java
index 01da8ed..4bc0901 100644
--- a/ratis-examples/src/test/java/org/apache/ratis/examples/arithmetic/TestArithmeticLogDump.java
+++ b/ratis-examples/src/test/java/org/apache/ratis/examples/arithmetic/TestArithmeticLogDump.java
@@ -28,7 +28,6 @@ import org.apache.ratis.RaftTestUtil;
 import org.apache.ratis.conf.RaftProperties;
 import org.apache.ratis.server.RaftServer;
 import org.apache.ratis.server.RaftServerConfigKeys;
-import org.apache.ratis.server.impl.RaftServerTestUtil;
 import org.apache.ratis.server.simulation.MiniRaftClusterWithSimulatedRpc;
 import org.apache.ratis.server.storage.RaftStorageDirectory;
 import org.apache.ratis.statemachine.SimpleStateMachine4Testing;
@@ -78,7 +77,7 @@ public class TestArithmeticLogDump extends BaseTest {
   public void testLogDump() throws Exception {
     final RaftServer.Division leaderServer = RaftTestUtil.waitForLeader(cluster);
     List<RaftStorageDirectory.LogPathAndIndex> files =
-        RaftServerTestUtil.getRaftStorage(leaderServer).getStorageDir().getLogSegmentFiles();
+        leaderServer.getRaftStorage().getStorageDir().getLogSegmentFiles();
     Assert.assertEquals(1, files.size());
     cluster.shutdown();
 
diff --git a/ratis-server/src/main/java/org/apache/ratis/server/RaftServerRpcWithProxy.java b/ratis-server/src/main/java/org/apache/ratis/server/RaftServerRpcWithProxy.java
index 35ac277..625e0fa 100644
--- a/ratis-server/src/main/java/org/apache/ratis/server/RaftServerRpcWithProxy.java
+++ b/ratis-server/src/main/java/org/apache/ratis/server/RaftServerRpcWithProxy.java
@@ -29,28 +29,30 @@ import java.util.Collection;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-/** Implementing {@link RaftServerRpc} using a {@link PeerProxyMap}. */
+/** An abstract implementation of {@link RaftServerRpc} using a {@link PeerProxyMap}. */
 public abstract class RaftServerRpcWithProxy<PROXY extends Closeable, PROXIES extends PeerProxyMap<PROXY>>
     implements RaftServerRpc {
   private final Supplier<RaftPeerId> idSupplier;
   private final Supplier<LifeCycle> lifeCycleSupplier;
   private final Supplier<PROXIES> proxiesSupplier;
 
-  public RaftServerRpcWithProxy(Supplier<RaftPeerId> idSupplier, Function<RaftPeerId, PROXIES> proxyCreater) {
+  protected RaftServerRpcWithProxy(Supplier<RaftPeerId> idSupplier, Function<RaftPeerId, PROXIES> proxyCreater) {
     this.idSupplier = idSupplier;
     this.lifeCycleSupplier = JavaUtils.memoize(
         () -> new LifeCycle(getId() + "-" + JavaUtils.getClassSimpleName(getClass())));
     this.proxiesSupplier = JavaUtils.memoize(() -> proxyCreater.apply(getId()));
   }
 
+  /** @return the server id. */
   public RaftPeerId getId() {
     return idSupplier.get();
   }
 
-  public LifeCycle getLifeCycle() {
+  private LifeCycle getLifeCycle() {
     return lifeCycleSupplier.get();
   }
 
+  /** @return the underlying {@link PeerProxyMap}. */
   public PROXIES getProxies() {
     return proxiesSupplier.get();
   }
@@ -70,13 +72,15 @@ public abstract class RaftServerRpcWithProxy<PROXY extends Closeable, PROXIES ex
     getLifeCycle().startAndTransition(this::startImpl, IOException.class);
   }
 
-  public abstract void startImpl() throws IOException;
+  /** Implementation of the {@link #start()} method. */
+  protected abstract void startImpl() throws IOException;
 
   @Override
   public final void close() throws IOException{
-    getLifeCycle().checkStateAndClose(() -> closeImpl());
+    getLifeCycle().checkStateAndClose(this::closeImpl);
   }
 
+  /** Implementation of the {@link #close()} method. */
   public void closeImpl() throws IOException {
     getProxies().close();
   }
diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java
index 069386f..53fcaf8 100644
--- a/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java
+++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java
@@ -65,7 +65,7 @@ import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-public class RaftServerProxy implements RaftServer {
+class RaftServerProxy implements RaftServer {
   /**
    * A map: {@link RaftGroupId} -> {@link RaftServerImpl} futures.
    *
diff --git a/ratis-server/src/test/java/org/apache/ratis/InstallSnapshotNotificationTests.java b/ratis-server/src/test/java/org/apache/ratis/InstallSnapshotNotificationTests.java
index 6f72b54..ff982c6 100644
--- a/ratis-server/src/test/java/org/apache/ratis/InstallSnapshotNotificationTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/InstallSnapshotNotificationTests.java
@@ -131,7 +131,7 @@ public abstract class InstallSnapshotNotificationTests<CLUSTER extends MiniRaftC
 
       // wait for the snapshot to be done
       final RaftServer.Division leader = cluster.getLeader();
-      final RaftStorageDirectory storageDirectory = RaftServerTestUtil.getRaftStorage(leader).getStorageDir();
+      final RaftStorageDirectory storageDirectory = leader.getRaftStorage().getStorageDir();
 
       final long nextIndex = leader.getRaftLog().getNextIndex();
       LOG.info("nextIndex = {}", nextIndex);
diff --git a/ratis-server/src/test/java/org/apache/ratis/LogAppenderTests.java b/ratis-server/src/test/java/org/apache/ratis/LogAppenderTests.java
index f9dec53..02b46c9 100644
--- a/ratis-server/src/test/java/org/apache/ratis/LogAppenderTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/LogAppenderTests.java
@@ -142,7 +142,7 @@ public abstract class LogAppenderTests<CLUSTER extends MiniRaftCluster>
       throw e;
     }
 
-    final RatisMetricRegistry ratisMetricRegistry = RaftServerTestUtil.getRaftServerMetrics(leaderServer).getRegistry();
+    final RatisMetricRegistry ratisMetricRegistry = leaderServer.getRaftServerMetrics().getRegistry();
 
     // Get all last_heartbeat_elapsed_time metric gauges. Should be equal to number of followers.
     SortedMap<String, Gauge> heartbeatElapsedTimeGauges = ratisMetricRegistry.getGauges((s, metric) ->
@@ -158,7 +158,7 @@ public abstract class LogAppenderTests<CLUSTER extends MiniRaftCluster>
       // Metric in nanos > 0.
       assertTrue((long)metric.getValue() > 0);
       // Try to get Heartbeat metrics for follower.
-      final RaftServerMetrics followerMetrics = RaftServerTestUtil.getRaftServerMetrics(followerServer);
+      final RaftServerMetrics followerMetrics = followerServer.getRaftServerMetrics();
       // Metric should not exist. It only exists in leader.
       assertTrue(followerMetrics.getRegistry().getGauges((s, m) -> s.contains("lastHeartbeatElapsedTime")).isEmpty());
       for (boolean heartbeat : new boolean[] { true, false }) {
diff --git a/ratis-server/src/test/java/org/apache/ratis/server/impl/GroupManagementBaseTest.java b/ratis-server/src/test/java/org/apache/ratis/server/impl/GroupManagementBaseTest.java
index 44bc676..5bfce59 100644
--- a/ratis-server/src/test/java/org/apache/ratis/server/impl/GroupManagementBaseTest.java
+++ b/ratis-server/src/test/java/org/apache/ratis/server/impl/GroupManagementBaseTest.java
@@ -291,7 +291,7 @@ public abstract class GroupManagementBaseTest extends BaseTest {
         LOG.info(i + ") close " + cluster.printServers(g.getGroupId()));
         for(RaftPeer p : g.getPeers()) {
           final RaftServer.Division d = cluster.getDivision(p.getId(), g.getGroupId());
-          final File root = RaftServerTestUtil.getRaftStorage(d).getStorageDir().getRoot();
+          final File root = d.getRaftStorage().getStorageDir().getRoot();
           Assert.assertTrue(root.exists());
           Assert.assertTrue(root.isDirectory());
 
diff --git a/ratis-server/src/test/java/org/apache/ratis/server/impl/MiniRaftCluster.java b/ratis-server/src/test/java/org/apache/ratis/server/impl/MiniRaftCluster.java
index 177f5e4..254732d 100644
--- a/ratis-server/src/test/java/org/apache/ratis/server/impl/MiniRaftCluster.java
+++ b/ratis-server/src/test/java/org/apache/ratis/server/impl/MiniRaftCluster.java
@@ -354,6 +354,10 @@ public abstract class MiniRaftCluster implements Closeable {
     }
   }
 
+  public RaftServer newRaftServer(RaftPeerId id, StateMachine stateMachine, RaftProperties p) throws IOException {
+    return ServerImplUtils.newRaftServer(id, getGroup(), gid -> stateMachine, p, null);
+  }
+
   protected abstract Parameters setPropertiesAndInitParameters(
       RaftPeerId id, RaftGroup group, RaftProperties properties);
 
diff --git a/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java b/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java
index 183284e..9a9cc9b 100644
--- a/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java
+++ b/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java
@@ -86,7 +86,7 @@ public abstract class RaftReconfigurationBaseTest<CLUSTER extends MiniRaftCluste
     for (int i = 0; i < peersWithPriority.size(); i ++) {
       RaftPeerId peerId = peersWithPriority.get(i).getId();
       final RaftServer.Division server = cluster.getDivision(peerId, groupId);
-      final RaftConfiguration conf = RaftServerTestUtil.getRaftConf(server);
+      final RaftConfiguration conf = server.getRaftConf();
 
       for (int j = 0; j < peersWithPriority.size(); j ++) {
         int priorityInConf = conf.getPeer(peersWithPriority.get(j).getId()).getPriority();
@@ -474,7 +474,7 @@ public abstract class RaftReconfigurationBaseTest<CLUSTER extends MiniRaftCluste
 
       final RaftLog leaderLog = leader.getRaftLog();
       final long committedIndex = leaderLog.getLastCommittedIndex();
-      final RaftConfiguration confBefore = RaftServerTestUtil.getRaftConf(cluster.getLeader());
+      final RaftConfiguration confBefore = cluster.getLeader().getRaftConf();
 
       // no real configuration change in the request
       final RaftClientReply reply = client.setConfiguration(cluster.getPeers().toArray(RaftPeer.emptyArray()));
@@ -484,7 +484,7 @@ public abstract class RaftReconfigurationBaseTest<CLUSTER extends MiniRaftCluste
         final LogEntryProto e = leaderLog.get(i);
         Assert.assertTrue(e.hasMetadataEntry());
       }
-      Assert.assertSame(confBefore, RaftServerTestUtil.getRaftConf(cluster.getLeader()));
+      Assert.assertSame(confBefore, cluster.getLeader().getRaftConf());
       client.close();
     }
   }
diff --git a/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftServerTestUtil.java b/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftServerTestUtil.java
index 9fc50f1..ef42819 100644
--- a/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftServerTestUtil.java
+++ b/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftServerTestUtil.java
@@ -30,7 +30,6 @@ import org.apache.ratis.server.RaftConfiguration;
 import org.apache.ratis.server.RaftServer;
 import org.apache.ratis.server.RaftServerRpc;
 import org.apache.ratis.server.leader.LogAppender;
-import org.apache.ratis.server.metrics.RaftServerMetrics;
 import org.apache.ratis.server.raftlog.segmented.SegmentedRaftLog;
 import org.apache.ratis.server.storage.RaftStorage;
 import org.apache.ratis.util.JavaUtils;
@@ -120,18 +119,6 @@ public class RaftServerTestUtil {
     return RaftConfigurationImpl.newBuilder().setConf(peers).build();
   }
 
-  public static RaftConfiguration getRaftConf(RaftServer.Division server) {
-    return ((RaftServerImpl)server).getRaftConf();
-  }
-
-  public static RaftStorage getRaftStorage(RaftServer.Division server) {
-    return ((RaftServerImpl)server).getState().getStorage();
-  }
-
-  public static RaftServerMetrics getRaftServerMetrics(RaftServer.Division server) {
-    return ((RaftServerImpl)server).getRaftServerMetrics();
-  }
-
   public static RaftServerRpc getServerRpc(RaftServer.Division server) {
     return ((RaftServerImpl)server).getRaftServer().getServerRpc();
   }
diff --git a/ratis-server/src/test/java/org/apache/ratis/server/impl/TestRatisServerMetricsBase.java b/ratis-server/src/test/java/org/apache/ratis/server/impl/TestRatisServerMetricsBase.java
index d87004e..9cdad69 100644
--- a/ratis-server/src/test/java/org/apache/ratis/server/impl/TestRatisServerMetricsBase.java
+++ b/ratis-server/src/test/java/org/apache/ratis/server/impl/TestRatisServerMetricsBase.java
@@ -61,7 +61,7 @@ public abstract class TestRatisServerMetricsBase<CLUSTER extends MiniRaftCluster
         0, Message.EMPTY, RaftClientRequest.staleReadRequestType(Long.MAX_VALUE), null);
     final CompletableFuture<RaftClientReply> f = leaderImpl.getRaftServer().submitClientRequestAsync(r);
     Assert.assertTrue(!f.get().isSuccess());
-    assertEquals(1L, RaftServerTestUtil.getRaftServerMetrics(leaderImpl).getRegistry()
+    assertEquals(1L, leaderImpl.getRaftServerMetrics().getRegistry()
         .counter(RATIS_SERVER_FAILED_CLIENT_STALE_READ_COUNT).getCount());
   }
 }
diff --git a/ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java b/ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java
index d6f41d8..b5a5f31 100644
--- a/ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java
+++ b/ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java
@@ -198,7 +198,7 @@ public abstract class RaftSnapshotBaseTest extends BaseTest {
       }
 
       // wait for the snapshot to be done
-      RaftStorageDirectory storageDirectory = RaftServerTestUtil.getRaftStorage(cluster.getLeader()).getStorageDir();
+      final RaftStorageDirectory storageDirectory = cluster.getLeader().getRaftStorage().getStorageDir();
 
       final long nextIndex = cluster.getLeader().getRaftLog().getNextIndex();
       LOG.info("nextIndex = {}", nextIndex);
@@ -261,7 +261,7 @@ public abstract class RaftSnapshotBaseTest extends BaseTest {
   }
 
   protected void verifyInstallSnapshotMetric(RaftServer.Division leader) {
-    final Counter installSnapshotCounter = RaftServerTestUtil.getRaftServerMetrics(leader)
+    final Counter installSnapshotCounter = leader.getRaftServerMetrics()
         .getCounter(LOG_APPENDER_INSTALL_SNAPSHOT_METRIC);
     Assert.assertNotNull(installSnapshotCounter);
     Assert.assertTrue(installSnapshotCounter.getCount() >= 1);
diff --git a/ratis-test/src/test/java/org/apache/ratis/TestRaftServerSlownessDetection.java b/ratis-test/src/test/java/org/apache/ratis/TestRaftServerSlownessDetection.java
index 0d28bb5..745470f 100644
--- a/ratis-test/src/test/java/org/apache/ratis/TestRaftServerSlownessDetection.java
+++ b/ratis-test/src/test/java/org/apache/ratis/TestRaftServerSlownessDetection.java
@@ -90,7 +90,7 @@ public class TestRaftServerSlownessDetection extends BaseTest {
         .slownessTimeout(cluster.getProperties()).toIntExact(TimeUnit.MILLISECONDS);
     RaftServer.Division failedFollower = cluster.getFollowers().get(0);
 
-    final RatisMetricRegistry ratisMetricRegistry = RaftServerTestUtil.getRaftServerMetrics(leaderServer).getRegistry();
+    final RatisMetricRegistry ratisMetricRegistry = leaderServer.getRaftServerMetrics().getRegistry();
     SortedMap<String, Gauge> heartbeatElapsedTimeGauges =
         ratisMetricRegistry.getGauges((s, metric) ->
             s.contains("lastHeartbeatElapsedTime"));
diff --git a/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftServerWithGrpc.java b/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftServerWithGrpc.java
index e652e86..bf57765 100644
--- a/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftServerWithGrpc.java
+++ b/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftServerWithGrpc.java
@@ -30,7 +30,6 @@ import com.codahale.metrics.Gauge;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.log4j.Level;
 import org.apache.ratis.BaseTest;
-import org.apache.ratis.protocol.RaftGroup;
 import org.apache.ratis.server.impl.MiniRaftCluster;
 import org.apache.ratis.RaftTestUtil;
 import org.apache.ratis.RaftTestUtil.SimpleMessage;
@@ -54,7 +53,6 @@ import org.apache.ratis.server.RaftServerConfigKeys;
 import org.apache.ratis.server.RaftServerRpc;
 import org.apache.ratis.server.metrics.RaftServerMetrics;
 import org.apache.ratis.server.impl.RaftServerTestUtil;
-import org.apache.ratis.server.impl.ServerImplUtils;
 import org.apache.ratis.statemachine.SimpleStateMachine4Testing;
 import org.apache.ratis.statemachine.StateMachine;
 import org.apache.ratis.util.Log4jUtils;
@@ -106,7 +104,7 @@ public class TestRaftServerWithGrpc extends BaseTest implements MiniRaftClusterW
     // be used by next raft server proxy instance.
     final StateMachine stateMachine = cluster.getLeader().getStateMachine();
     RaftServerConfigKeys.setStorageDir(p, Collections.singletonList(cluster.getStorageDir(leaderId)));
-    ServerImplUtils.newRaftServer(leaderId, cluster.getGroup(), gid -> stateMachine, p, null);
+    cluster.newRaftServer(leaderId, stateMachine, p);
     // Close the server rpc for leader so that new raft server can be bound to it.
     RaftServerTestUtil.getServerRpc(cluster.getLeader()).close();
 
@@ -116,18 +114,12 @@ public class TestRaftServerWithGrpc extends BaseTest implements MiniRaftClusterW
     // the rpc server on failure.
     RaftServerConfigKeys.setStorageDir(p, Collections.singletonList(cluster.getStorageDir(leaderId)));
     testFailureCase("start a new server with the same address",
-        () -> startNewServer(leaderId, cluster.getGroup(), stateMachine, p),
+        () -> cluster.newRaftServer(leaderId, stateMachine, p).start(),
         IOException.class, OverlappingFileLockException.class);
     // Try to start a raft server rpc at the leader address.
     cluster.getServerFactory(leaderId).newRaftServerRpc(cluster.getServer(leaderId));
   }
 
-  static void startNewServer(RaftPeerId id, RaftGroup group, StateMachine stateMachine, RaftProperties properties)
-      throws Exception {
-    final RaftServer d = ServerImplUtils.newRaftServer(id, group, gid -> stateMachine, properties, null);
-    d.start();
-  }
-
   @Test
   public void testUnsupportedMethods() throws Exception {
     runWithNewCluster(1, this::runTestUnsupportedMethods);
@@ -236,7 +228,7 @@ public class TestRaftServerWithGrpc extends BaseTest implements MiniRaftClusterW
       client.async().send(new SimpleMessage(message));
 
 
-      final SortedMap<String, Gauge> gaugeMap = RaftServerTestUtil.getRaftServerMetrics(cluster.getLeader())
+      final SortedMap<String, Gauge> gaugeMap = cluster.getLeader().getRaftServerMetrics()
           .getRegistry().getGauges((s, metric) -> s.contains(REQUEST_BYTE_SIZE));
 
       RaftTestUtil.waitFor(() -> (int) gaugeMap.get(gaugeMap.firstKey()).getValue() == message.length(),
@@ -249,7 +241,7 @@ public class TestRaftServerWithGrpc extends BaseTest implements MiniRaftClusterW
       }
 
       // Because we have passed 11 requests, and the element queue size is 10.
-      RaftTestUtil.waitFor(() -> RaftServerTestUtil.getRaftServerMetrics(cluster.getLeader())
+      RaftTestUtil.waitFor(() -> cluster.getLeader().getRaftServerMetrics()
           .getCounter(REQUEST_QUEUE_LIMIT_HIT_COUNTER).getCount() == 1, 300, 5000);
 
       stateMachine.unblockFlushStateMachineData();
@@ -261,10 +253,10 @@ public class TestRaftServerWithGrpc extends BaseTest implements MiniRaftClusterW
       client.async().send(new SimpleMessage(RandomStringUtils.random(120, true, false)));
       clients.add(client);
 
-      RaftTestUtil.waitFor(() -> RaftServerTestUtil.getRaftServerMetrics(cluster.getLeader())
+      RaftTestUtil.waitFor(() -> cluster.getLeader().getRaftServerMetrics()
               .getCounter(REQUEST_BYTE_SIZE_LIMIT_HIT_COUNTER).getCount() == 1, 300, 5000);
 
-      Assert.assertEquals(2, RaftServerTestUtil.getRaftServerMetrics(cluster.getLeader())
+      Assert.assertEquals(2, cluster.getLeader().getRaftServerMetrics()
               .getCounter(RESOURCE_LIMIT_HIT_COUNTER).getCount());
     } finally {
       for (RaftClient client : clients) {
@@ -277,7 +269,7 @@ public class TestRaftServerWithGrpc extends BaseTest implements MiniRaftClusterW
   void testRaftClientRequestMetrics(MiniRaftClusterWithGrpc cluster) throws IOException,
       ExecutionException, InterruptedException {
     final RaftServer.Division leader = RaftTestUtil.waitForLeader(cluster);
-    RaftServerMetrics raftServerMetrics = RaftServerTestUtil.getRaftServerMetrics(leader);
+    RaftServerMetrics raftServerMetrics = leader.getRaftServerMetrics();
 
     try (final RaftClient client = cluster.createClient()) {
       final CompletableFuture<RaftClientReply> f1 = client.async().send(new SimpleMessage("testing"));
diff --git a/ratis-test/src/test/java/org/apache/ratis/server/ServerRestartTests.java b/ratis-test/src/test/java/org/apache/ratis/server/ServerRestartTests.java
index 6cf0f2b..d1ac48c 100644
--- a/ratis-test/src/test/java/org/apache/ratis/server/ServerRestartTests.java
+++ b/ratis-test/src/test/java/org/apache/ratis/server/ServerRestartTests.java
@@ -170,7 +170,7 @@ public abstract class ServerRestartTests<CLUSTER extends MiniRaftCluster>
   }
 
   static List<Path> getOpenLogFiles(RaftServer.Division server) throws Exception {
-    return RaftServerTestUtil.getRaftStorage(server).getStorageDir().getLogSegmentFiles().stream()
+    return server.getRaftStorage().getStorageDir().getLogSegmentFiles().stream()
         .filter(LogPathAndIndex::isOpen)
         .map(LogPathAndIndex::getPath)
         .collect(Collectors.toList());