From 8fddf8caaf4c4fd926be3b514bfaeb0ee085c827 Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <adoroszlai@apache.org>
Date: Thu, 3 Apr 2025 08:36:32 +0200
Subject: [PATCH] HDDS-4517. Remove leftover references to RaftServerImpl

---
 hadoop-hdds/common/pom.xml                                  | 6 ------
 .../java/org/apache/hadoop/hdds/scm/ha/SCMStateMachine.java | 3 ---
 .../apache/hadoop/ozone/insight/datanode/RatisInsight.java  | 2 +-
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/hadoop-hdds/common/pom.xml b/hadoop-hdds/common/pom.xml
index 67aa45a6faa2..ba2726afeef8 100644
--- a/hadoop-hdds/common/pom.xml
+++ b/hadoop-hdds/common/pom.xml
@@ -220,12 +220,6 @@
     </dependency>
 
     <!-- Test dependencies -->
-    <dependency>
-      <!-- Needed for mocking RaftServerImpl -->
-      <groupId>com.codahale.metrics</groupId>
-      <artifactId>metrics-core</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.ozone</groupId>
       <artifactId>hdds-test-utils</artifactId>
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMStateMachine.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMStateMachine.java
index 137b89ff74c6..a948b9a7a87a 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMStateMachine.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMStateMachine.java
@@ -82,9 +82,6 @@ public class SCMStateMachine extends BaseStateMachine {
   private final boolean isInitialized;
   private ExecutorService installSnapshotExecutor;
 
-  // The atomic variable RaftServerImpl#inProgressInstallSnapshotRequest
-  // ensures serializable between notifyInstallSnapshotFromLeader()
-  // and reinitialize().
   private DBCheckpoint installingDBCheckpoint = null;
   private List<ManagedSecretKey> installingSecretKeys = null;
 
diff --git a/hadoop-ozone/insight/src/main/java/org/apache/hadoop/ozone/insight/datanode/RatisInsight.java b/hadoop-ozone/insight/src/main/java/org/apache/hadoop/ozone/insight/datanode/RatisInsight.java
index 61369e320174..4a8d25c6daa2 100644
--- a/hadoop-ozone/insight/src/main/java/org/apache/hadoop/ozone/insight/datanode/RatisInsight.java
+++ b/hadoop-ozone/insight/src/main/java/org/apache/hadoop/ozone/insight/datanode/RatisInsight.java
@@ -54,7 +54,7 @@ public List<LoggerSource> getRelatedLoggers(boolean verbose,
           dn -> {
             result
                 .add(new LoggerSource(dn,
-                    "org.apache.ratis.server.impl",
+                    "org.apache.ratis.server",
                     defaultLevel(verbose)));
             return null;
           });