Revert "Merge pull request #7837 from vespa-engine/revert-7836-bratseth/remove-unused-rpc-server-take-3"

This reverts commit 0c39992b60e6103a85fa00362df74930a660e51c, reversing
changes made to a8277a3a486f7fd174e562bf174cfa72aede9cee.

1 files changed, 29 insertions, 2 deletions

diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
index 69a525a2c54..8ab39ca8166 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
@@ -5,13 +5,13 @@ import com.google.common.collect.MapMaker;
 import com.google.inject.AbstractModule;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
+import com.yahoo.cloud.config.SlobroksConfig;
 import com.yahoo.component.provider.ComponentRegistry;
 import com.yahoo.concurrent.DaemonThreadFactory;
 import com.yahoo.config.ConfigInstance;
 import com.yahoo.config.subscription.ConfigInterruptedException;
 import com.yahoo.container.Container;
 import com.yahoo.container.QrConfig;
-import com.yahoo.container.Server;
 import com.yahoo.container.core.ChainsConfig;
 import com.yahoo.container.core.config.HandlersConfigurerDi;
 import com.yahoo.container.di.config.Subscriber;
@@ -30,8 +30,14 @@ import com.yahoo.jdisc.handler.RequestHandler;
 import com.yahoo.jdisc.service.ClientProvider;
 import com.yahoo.jdisc.service.ServerProvider;
 import com.yahoo.jrt.ListenFailedException;
+import com.yahoo.jrt.Spec;
+import com.yahoo.jrt.Supervisor;
+import com.yahoo.jrt.Transport;
+import com.yahoo.jrt.slobrok.api.Register;
+import com.yahoo.jrt.slobrok.api.SlobrokList;
 import com.yahoo.log.LogLevel;
 import com.yahoo.log.LogSetup;
+import com.yahoo.net.HostName;
 import com.yahoo.osgi.OsgiImpl;
 import com.yahoo.vespa.config.ConfigKey;
 import com.yahoo.yolean.Exceptions;
@@ -73,6 +79,7 @@ public final class ConfiguredApplication implements Application {
     private final ContainerDiscApplication applicationWithLegacySetup;
     private final OsgiFramework osgiFramework;
     private final com.yahoo.jdisc.Timer timerSingleton;
+
     //TODO: FilterChainRepository should instead always be set up in the model.
     private final FilterChainRepository defaultFilterChainRepository =
             new FilterChainRepository(new ChainsConfig(new ChainsConfig.Builder()),
@@ -87,6 +94,7 @@ public final class ConfiguredApplication implements Application {
     private Thread reconfigurerThread;
     private Thread portWatcher;
     private QrConfig qrConfig;
+    private Register slobrokRegistrator = null;
 
     static {
         LogSetup.initVespaLogging("Container");
@@ -122,6 +130,9 @@ public final class ConfiguredApplication implements Application {
     @Override
     public void start() {
         qrConfig = getConfig(QrConfig.class);
+        SlobroksConfig slobroksConfig = getConfig(SlobroksConfig.class);
+        slobrokRegistrator = registerInSlobrok(slobroksConfig, qrConfig);
+
         hackToInitializeServer(qrConfig);
 
         ContainerBuilder builder = createBuilderWithGuiceBindings();
@@ -134,10 +145,23 @@ public final class ConfiguredApplication implements Application {
         portWatcher.start();
     }
 
+    /** The container has no rpc methods, but we still need to register it in Slobrok to enable orchestration */
+    private Register registerInSlobrok(SlobroksConfig slobrokConfig, QrConfig qrConfig) {
+        SlobrokList slobrokList = new SlobrokList();
+        slobrokList.setup(slobrokConfig.slobrok().stream().map(SlobroksConfig.Slobrok::connectionspec).toArray(String[]::new));
+        Spec mySpec = new Spec(HostName.getLocalhost(), qrConfig.rpc().port());
+        Register slobrokRegistrator = new Register(new Supervisor(new Transport()), slobrokList, mySpec);
+        slobrokRegistrator.registerName(qrConfig.rpc().slobrokId());
+        log.log(LogLevel.INFO,
+                "Registered name '" + qrConfig.rpc().slobrokId() + "' at " + mySpec + " with: " + slobrokList);
+        return slobrokRegistrator;
+    }
 
+    @SuppressWarnings("deprecation")
     private static void hackToInitializeServer(QrConfig config) {
         try {
-            Server.get().initialize(config);
+            Container.get().setupFileAcquirer(config.filedistributor());
+            com.yahoo.container.Server.get().initialize(config);
         } catch (Exception e) {
             log.log(LogLevel.ERROR, "Caught exception when initializing server. Exiting.", e);
             Runtime.getRuntime().halt(1);
@@ -294,6 +318,9 @@ public final class ConfiguredApplication implements Application {
         configurer.shutdown(new Deconstructor(false));
         Container.get().shutdown();
 
+        if (slobrokRegistrator != null)
+            slobrokRegistrator.shutdown();
+
         log.info("Stop: Finished");
     }