Use HintsService in place of HintedHandoffManager (#54)

k8ssandra · Nov 18, 2020 · 56d0ec0 · 56d0ec0
1 parent 5256425
commit 56d0ec0
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 2 deletions.
diff --git a/management-api-agent/src/main/java/com/datastax/mgmtapi/NodeOpsProvider.java b/management-api-agent/src/main/java/com/datastax/mgmtapi/NodeOpsProvider.java
@@ -116,14 +116,14 @@ public void drain() throws InterruptedException, ExecutionException, IOException
     public void truncateHints()
     {
         logger.debug("Truncating all hints");
-        ShimLoader.instance.get().getHintedHandoffManager().truncateAllHints();
+        ShimLoader.instance.get().getHintsService().deleteAllHints();
     }
 
     @Rpc(name = "truncateHintsForHost")
     public void truncateHints(@RpcParam(name="host") String host)
     {
         logger.debug("Truncating hints for host {}", host);
-        ShimLoader.instance.get().getHintedHandoffManager().deleteHintsForEndpoint(host);
+        ShimLoader.instance.get().getHintsService().deleteAllHintsForEndpoint(host);
     }
 
     @Rpc(name = "resetLocalSchema")

diff --git a/management-api-common/src/main/java/com/datastax/mgmtapi/shims/CassandraAPI.java b/management-api-common/src/main/java/com/datastax/mgmtapi/shims/CassandraAPI.java
@@ -23,6 +23,7 @@
 import org.apache.cassandra.db.HintedHandOffManager;
 import org.apache.cassandra.db.compaction.CompactionManager;
 import org.apache.cassandra.gms.Gossiper;
+import org.apache.cassandra.hints.HintsService;
 import org.apache.cassandra.locator.SeedProvider;
 import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.transport.Server;
@@ -55,6 +56,7 @@ default UntypedResultSet processQuery(String query, ConsistencyLevel consistency
 
     IRoleManager getRoleManager();
 
+    @Deprecated
     HintedHandOffManager getHintedHandoffManager();
 
     CompactionManager getCompactionManager();
@@ -69,4 +71,6 @@ default Object handleRpcResult(Callable<Object> rpcResult) throws Exception
     String getLocalDataCenter();
 
     RpcStatementShim makeRpcStatement(String method, String[] params);
+
+    HintsService getHintsService();
 }
diff --git a/management-api-shim-3.x/src/main/java/com/datastax/mgmtapi/shim/CassandraAPI3x.java b/management-api-shim-3.x/src/main/java/com/datastax/mgmtapi/shim/CassandraAPI3x.java
@@ -42,6 +42,7 @@
 import org.apache.cassandra.gms.EndpointState;
 import org.apache.cassandra.gms.Gossiper;
 import org.apache.cassandra.gms.VersionedValue;
+import org.apache.cassandra.hints.HintsService;
 import org.apache.cassandra.locator.AbstractReplicationStrategy;
 import org.apache.cassandra.locator.IEndpointSnitch;
 import org.apache.cassandra.locator.K8SeedProvider3x;
@@ -305,4 +306,10 @@ public RpcStatementShim makeRpcStatement(String method, String[] params)
     {
         throw new UnsupportedOperationException();
     }
+
+    @Override
+    public HintsService getHintsService()
+    {
+        return HintsService.instance;
+    }
 }
diff --git a/management-api-shim-4.x/src/main/java/com/datastax/mgmtapi/shim/CassandraAPI4x.java b/management-api-shim-4.x/src/main/java/com/datastax/mgmtapi/shim/CassandraAPI4x.java
@@ -42,6 +42,7 @@
 import org.apache.cassandra.gms.EndpointState;
 import org.apache.cassandra.gms.Gossiper;
 import org.apache.cassandra.gms.VersionedValue;
+import org.apache.cassandra.hints.HintsService;
 import org.apache.cassandra.locator.AbstractReplicationStrategy;
 import org.apache.cassandra.locator.EndpointsForRange;
 import org.apache.cassandra.locator.IEndpointSnitch;
@@ -309,4 +310,10 @@ public RpcStatementShim makeRpcStatement(String method, String[] params)
     {
         return new RpcStatement(method, params);
     }
+
+    @Override
+    public HintsService getHintsService()
+    {
+        return HintsService.instance;
+    }
 }
diff --git a/management-api-shim-dse-6.8/src/main/java/com/datastax/mgmtapi/shim/DseAPI68.java b/management-api-shim-dse-6.8/src/main/java/com/datastax/mgmtapi/shim/DseAPI68.java
@@ -46,6 +46,7 @@
 import org.apache.cassandra.gms.EndpointState;
 import org.apache.cassandra.gms.Gossiper;
 import org.apache.cassandra.gms.VersionedValue;
+import org.apache.cassandra.hints.HintsService;
 import org.apache.cassandra.locator.AbstractReplicationStrategy;
 import org.apache.cassandra.locator.IEndpointSnitch;
 import org.apache.cassandra.locator.K8SeedProviderDse68;
@@ -323,4 +324,10 @@ public RpcStatementShim makeRpcStatement(String method, String[] params)
     {
         throw new UnsupportedOperationException();
     }
+
+    @Override
+    public HintsService getHintsService()
+    {
+        return HintsService.instance;
+    }
 }