diff options
author | Arne H Juul <arnej@yahooinc.com> | 2021-09-30 07:44:16 +0000 |
---|---|---|
committer | Arne H Juul <arnej@yahooinc.com> | 2021-09-30 07:44:16 +0000 |
commit | 4eac8d74ad0217f66d16fcf519e998ff35a33e00 (patch) | |
tree | 13386cd7dba8168090b4484de520ca88f3f5e3be /config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java | |
parent | 7a6132ffc9b6ef8bea32d7de4c10b977bb964d49 (diff) |
feature flag cleanup (part 1)
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/admin/Slobrok.java | 7 |
1 files changed, 1 insertions, 6 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 07b1de3fdad..2b9551c2858 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 @@ -17,7 +17,6 @@ public class Slobrok extends AbstractService implements StateserverConfig.Produc private static final long serialVersionUID = 1L; public final static int BASEPORT = 19099; - public final boolean useNewLogic; @Override public void getConfig(StateserverConfig.Builder builder) { @@ -32,7 +31,6 @@ public class Slobrok extends AbstractService implements StateserverConfig.Produc ModelContext.FeatureFlags featureFlags) { super(parent, "slobrok." + index); - this.useNewLogic = featureFlags.newLocationBrokerLogic(); portsMeta.on(0).tag("rpc").tag("admin").tag("status"); portsMeta.on(1).tag("http").tag("state"); setProp("index", index); @@ -50,10 +48,7 @@ public class Slobrok extends AbstractService implements StateserverConfig.Produc } public String getStartupCommand() { - if (useNewLogic) { - return "exec $ROOT/sbin/vespa-slobrok -N -p " + getRpcPort() + " -c " + getConfigId(); - } - return "exec $ROOT/sbin/vespa-slobrok -p " + getRpcPort() + " -c " + getConfigId(); + return "exec $ROOT/sbin/vespa-slobrok -N -p " + getRpcPort() + " -c " + getConfigId(); } @Override |