Update abi

4 files changed, 25 insertions, 5 deletions

diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json
index 99a12fa654d..6d0bce74d2c 100644
--- a/container-search/abi-spec.json
+++ b/container-search/abi-spec.json
@@ -1954,6 +1954,7 @@
     "methods": [
       "public void <init>(com.yahoo.search.cluster.NodeManager)",
       "public void <init>(com.yahoo.search.cluster.NodeManager, boolean)",
+      "public void start()",
       "public com.yahoo.search.cluster.MonitorConfiguration getConfiguration()",
       "public void add(java.lang.Object, boolean)",
       "public com.yahoo.search.cluster.BaseNodeMonitor getNodeMonitor(java.lang.Object)",
@@ -1978,8 +1979,8 @@
     "methods": [
       "public void <init>(com.yahoo.component.ComponentId, java.util.List, boolean)",
       "public void <init>(com.yahoo.component.ComponentId, java.util.List, com.yahoo.search.cluster.Hasher, boolean)",
-      "public void <init>(com.yahoo.component.ComponentId, java.util.List, com.yahoo.search.cluster.Hasher, boolean, boolean)",
-      "public final void ping(java.lang.Object, java.util.concurrent.Executor)",
+      "protected void <init>(com.yahoo.component.ComponentId, java.util.List, com.yahoo.search.cluster.Hasher, boolean, boolean)",
+      "public final void ping(com.yahoo.search.cluster.ClusterMonitor, java.lang.Object, java.util.concurrent.Executor)",
       "protected abstract com.yahoo.prelude.Pong ping(com.yahoo.prelude.Ping, java.lang.Object)",
       "protected java.lang.Object getFirstConnection(com.yahoo.search.cluster.Hasher$NodeList, int, int, com.yahoo.search.Query)",
       "public final com.yahoo.search.Result search(com.yahoo.search.Query, com.yahoo.search.searchchain.Execution)",
@@ -2074,7 +2075,8 @@
     "methods": [
       "public abstract void working(java.lang.Object)",
       "public abstract void failed(java.lang.Object)",
-      "public abstract void ping(java.lang.Object, java.util.concurrent.Executor)",
+      "public void ping(java.lang.Object, java.util.concurrent.Executor)",
+      "public void ping(com.yahoo.search.cluster.ClusterMonitor, java.lang.Object, java.util.concurrent.Executor)",
       "public void pingIterationCompleted()"
     ],
     "fields": []
diff --git a/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java b/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java
index 74a007d35d3..55f0816514d 100644
--- a/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java
+++ b/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java
@@ -39,7 +39,7 @@ public class ClusterMonitor<T> {
     private final Map<T, TrafficNodeMonitor<T>> nodeMonitors = Collections.synchronizedMap(new java.util.LinkedHashMap<>());
 
     /** @deprecated It is not advised to start the monitoring thread in the constructor.
-     * Use ClusterMonitor(NodeManager<T> manager, false) and explicit start(). */
+     * Use ClusterMonitor(NodeManager manager, false) and explicit start(). */
     @Deprecated
     public ClusterMonitor(NodeManager<T> manager) {
         this(manager, true);
diff --git a/container-search/src/main/java/com/yahoo/search/cluster/NodeManager.java b/container-search/src/main/java/com/yahoo/search/cluster/NodeManager.java
index ffd26e3088d..481f1e1b5a5 100644
--- a/container-search/src/main/java/com/yahoo/search/cluster/NodeManager.java
+++ b/container-search/src/main/java/com/yahoo/search/cluster/NodeManager.java
@@ -20,7 +20,7 @@ public interface NodeManager<T> {
     /** 
      * Called when a node should be pinged. 
      * This *must* lead to either a call to NodeMonitor.failed or NodeMonitor.responded
-     * @deprecated Use ping(ClusterMonitor<T> clusterMonitor, T node, Executor executor) instead.
+     * @deprecated Use ping(ClusterMonitor clusterMonitor, T node, Executor executor) instead.
      */
     @Deprecated
     default void ping(T node, Executor executor) {
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcPingFactory.java b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcPingFactory.java
new file mode 100644
index 00000000000..ac8f0a59c20
--- /dev/null
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcPingFactory.java
@@ -0,0 +1,18 @@
+package com.yahoo.search.dispatch.rpc;
+
+import com.yahoo.search.cluster.ClusterMonitor;
+import com.yahoo.search.dispatch.searchcluster.Node;
+import com.yahoo.search.dispatch.searchcluster.PingFactory;
+import com.yahoo.search.dispatch.searchcluster.Pinger;
+import com.yahoo.search.dispatch.searchcluster.PongHandler;
+
+public class RpcPingFactory implements PingFactory {
+    private final RpcResourcePool rpcResourcePool;
+    public RpcPingFactory(RpcResourcePool rpcResourcePool) {
+        this.rpcResourcePool = rpcResourcePool;
+    }
+    @Override
+    public Pinger createPinger(Node node, ClusterMonitor<Node> monitor, PongHandler pongHandler) {
+        return new RpcPing(node, monitor, rpcResourcePool, pongHandler);
+    }
+}