Revert "Balder/quick restart of slobrok"

2 files changed, 7 insertions, 19 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java
index aa6192291d3..093694f41b3 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.model.admin;
 
 import com.yahoo.config.model.producer.AbstractConfigProducer;
-import com.yahoo.vespa.config.StateserverConfig;
 import com.yahoo.vespa.model.AbstractService;
 
 /**
@@ -10,14 +9,9 @@ import com.yahoo.vespa.model.AbstractService;
  *
  * @author  gjoranv
  */
-public class Slobrok extends AbstractService implements StateserverConfig.Producer {
+public class Slobrok extends AbstractService {
     private static final long serialVersionUID = 1L;
 
-    @Override
-    public void getConfig(StateserverConfig.Builder builder) {
-        builder.httpport(getStatePort());
-    }
-
     /**
      * @param parent The parent ConfigProducer.
      * @param index  unique index for all slobroks
@@ -46,7 +40,9 @@ public class Slobrok extends AbstractService implements StateserverConfig.Produc
     }
 
     public String getStartupCommand() {
-        return "exec $ROOT/sbin/vespa-slobrok -p " + getPort() + " -c " + getConfigId();
+        return "exec $ROOT/sbin/vespa-slobrok -p " + getPort() +
+                " -s " + getStatePort() +
+                " -c " + getConfigId();
     }
 
     /**
@@ -59,15 +55,15 @@ public class Slobrok extends AbstractService implements StateserverConfig.Produc
     /**
      * @return The port on which this slobrok should respond, as a String.
      */
-    private String getPort() {
+    public String getPort() {
         return String.valueOf(getRelativePort(0));
     }
 
     /**
      * @return The port on which the state server should respond
      */
-    public int getStatePort() {
-        return getRelativePort(1);
+    public String getStatePort() {
+        return String.valueOf(getRelativePort(1));
     }
 
     /**
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java
index a88d3b388a9..5e6241a7043 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java
@@ -17,7 +17,6 @@ import com.yahoo.config.provision.Zone;
 import com.yahoo.container.StatisticsConfig;
 import com.yahoo.container.jdisc.config.HealthMonitorConfig;
 import com.yahoo.net.HostName;
-import com.yahoo.vespa.config.StateserverConfig;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.container.ContainerCluster;
 import com.yahoo.vespa.model.container.component.Component;
@@ -84,13 +83,6 @@ public class AdminTestCase {
         }
         assertTrue(localHostOK);
 
-        StateserverConfig.Builder ssb = new StateserverConfig.Builder();
-        vespaModel.getConfig(ssb, "admin/slobrok.0");
-        assertEquals(19100, new StateserverConfig(ssb).httpport());
-
-        vespaModel.getConfig(ssb, "admin/slobrok.1");
-        assertEquals(19102, new StateserverConfig(ssb).httpport());
-
         LogdConfig.Builder lb = new LogdConfig.Builder();
         vespaModel.getConfig(lb, "admin/slobrok.0");
         LogdConfig lc = new LogdConfig(lb);