use a shared transport layer for health monitor

4 files changed, 35 insertions, 19 deletions

diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/slobrok/SlobrokMonitor.java b/service-monitor/src/main/java/com/yahoo/vespa/service/slobrok/SlobrokMonitor.java
index 976aab7f732..3ba505d0ab4 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/slobrok/SlobrokMonitor.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/slobrok/SlobrokMonitor.java
@@ -24,21 +24,19 @@ public class SlobrokMonitor implements AutoCloseable {
 
     private final SlobrokList slobrokList;
     private final Mirror mirror;
-    private final Transport transport;
 
-    SlobrokMonitor() {
-        this(new SlobrokList(), new Transport("slobrok-monitor"));
+    SlobrokMonitor(Supervisor supervisor) {
+        this(new SlobrokList(), supervisor);
+    }
+
+    private SlobrokMonitor(SlobrokList slobrokList, Supervisor supervisor) {
+        this(slobrokList, new Mirror(supervisor, slobrokList));
     }
 
     // Package-private for testing.
-    SlobrokMonitor(SlobrokList slobrokList, Mirror mirror, Transport transport) {
+    SlobrokMonitor(SlobrokList slobrokList, Mirror mirror) {
         this.slobrokList = slobrokList;
         this.mirror = mirror;
-        this.transport = transport;
-    }
-
-    private SlobrokMonitor(SlobrokList slobrokList, Transport transport) {
-        this(slobrokList, new Mirror(new Supervisor(transport), slobrokList), transport);
     }
 
     void updateSlobrokList(ApplicationInfo application) {
@@ -74,9 +72,6 @@ public class SlobrokMonitor implements AutoCloseable {
     @Override
     public void close() {
         mirror.shutdown();
-        transport.sync()     // Wait for mirror shutdown.
-                 .shutdown() // Signal shutdown of transport threads.
-                 .join();    // Wait for shutdown of transport threads.
     }
 
     boolean registeredInSlobrok(String slobrokServiceName) {
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImpl.java b/service-monitor/src/main/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImpl.java
index 2cc3359d449..6a7e2dea084 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImpl.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImpl.java
@@ -2,8 +2,11 @@
 package com.yahoo.vespa.service.slobrok;
 
 import com.google.inject.Inject;
+import com.yahoo.component.AbstractComponent;
 import com.yahoo.config.model.api.ApplicationInfo;
 import com.yahoo.config.provision.ApplicationId;
+import com.yahoo.jrt.Supervisor;
+import com.yahoo.jrt.Transport;
 import com.yahoo.jrt.slobrok.api.Mirror;
 import java.util.logging.Level;
 import com.yahoo.vespa.applicationmodel.ClusterId;
@@ -21,7 +24,7 @@ import java.util.Optional;
 import java.util.function.Supplier;
 import java.util.logging.Logger;
 
-public class SlobrokMonitorManagerImpl implements SlobrokApi, MonitorManager {
+public class SlobrokMonitorManagerImpl extends AbstractComponent implements SlobrokApi, MonitorManager {
     private static final Logger logger =
             Logger.getLogger(SlobrokMonitorManagerImpl.class.getName());
 
@@ -30,14 +33,28 @@ public class SlobrokMonitorManagerImpl implements SlobrokApi, MonitorManager {
     private final Object monitor = new Object();
     private final HashMap<ApplicationId, SlobrokMonitor> slobrokMonitors = new HashMap<>();
     private final DuperModelManager duperModel;
+    private final Transport transport;
+
+    private static int getTransportThreadCount() {
+        return Math.max(4, Runtime.getRuntime().availableProcessors());
+    }
 
     @Inject
     public SlobrokMonitorManagerImpl(DuperModelManager duperModel) {
-        this(SlobrokMonitor::new, duperModel);
+        this(new Transport("slobrok-monitor", getTransportThreadCount() / 4), duperModel);
     }
 
-    SlobrokMonitorManagerImpl(Supplier<SlobrokMonitor> slobrokMonitorFactory, DuperModelManager duperModel) {
+    private SlobrokMonitorManagerImpl(Transport transport, DuperModelManager duperModel) {
+        this(transport, new Supervisor(transport), duperModel);
+    }
+
+    private SlobrokMonitorManagerImpl(Transport transport, Supervisor orb, DuperModelManager duperModel) {
+        this(() -> new SlobrokMonitor(orb), transport, duperModel);
+    }
+
+    SlobrokMonitorManagerImpl(Supplier<SlobrokMonitor> slobrokMonitorFactory, Transport transport, DuperModelManager duperModel) {
         this.slobrokMonitorFactory = slobrokMonitorFactory;
+        this.transport = transport;
         this.duperModel = duperModel;
     }
 
@@ -77,6 +94,11 @@ public class SlobrokMonitorManagerImpl implements SlobrokApi, MonitorManager {
     }
 
     @Override
+    public void deconstruct() {
+        transport.sync().shutdown().join();
+    }
+
+    @Override
     public List<Mirror.Entry> lookup(ApplicationId id, String pattern) {
         synchronized (monitor) {
             SlobrokMonitor slobrokMonitor = slobrokMonitors.get(id);
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImplTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImplTest.java
index eca7d695be6..8fabb385bb2 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImplTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImplTest.java
@@ -3,6 +3,7 @@ package com.yahoo.vespa.service.slobrok;
 
 import com.yahoo.config.model.api.ApplicationInfo;
 import com.yahoo.config.provision.ApplicationId;
+import com.yahoo.jrt.Transport;
 import com.yahoo.vespa.applicationmodel.ClusterId;
 import com.yahoo.vespa.applicationmodel.ConfigId;
 import com.yahoo.vespa.applicationmodel.ServiceStatus;
@@ -28,7 +29,7 @@ public class SlobrokMonitorManagerImplTest {
 
     private final DuperModelManager duperModelManager = mock(DuperModelManager.class);
     private final SlobrokMonitorManagerImpl slobrokMonitorManager =
-            new SlobrokMonitorManagerImpl(slobrokMonitorFactory, duperModelManager);
+            new SlobrokMonitorManagerImpl(slobrokMonitorFactory, mock(Transport.class), duperModelManager);
     private final SlobrokMonitor slobrokMonitor = mock(SlobrokMonitor.class);
     private final ApplicationId applicationId = ApplicationId.from("tenant", "app", "instance");
     private final ApplicationInfo application = mock(ApplicationInfo.class);
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorTest.java
index 3297823a0be..7757aed8ac7 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorTest.java
@@ -3,7 +3,6 @@ package com.yahoo.vespa.service.slobrok;
 
 import com.yahoo.config.model.api.ApplicationInfo;
 import com.yahoo.config.model.api.SuperModel;
-import com.yahoo.jrt.Transport;
 import com.yahoo.jrt.slobrok.api.Mirror;
 import com.yahoo.jrt.slobrok.api.SlobrokList;
 import com.yahoo.vespa.service.model.ExampleModel;
@@ -15,8 +14,7 @@ import static org.mockito.Mockito.verify;
 public class SlobrokMonitorTest {
     private final SlobrokList slobrokList = mock(SlobrokList.class);
     private final Mirror mirror = mock(Mirror.class);
-    private final Transport transport = mock(Transport.class);
-    private final SlobrokMonitor slobrokMonitor = new SlobrokMonitor(slobrokList, mirror, transport);
+    private final SlobrokMonitor slobrokMonitor = new SlobrokMonitor(slobrokList, mirror);
 
     @Test
     public void testUpdateSlobrokList() {