diff options
| author | Arne H Juul <arnej27959@users.noreply.github.com> | 2021-09-30 12:10:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-30 12:10:48 +0200 |
| commit | 5e92e546de339f40ff7f9eaa86da2deb56c8f2d8 (patch) | |
| tree | f1735e82892f0d9a6a2dfba884de1252bd70e679 /config-model | |
| parent | 3fd8cdc2b9a57dd36637b5441dfe07b89cd79ed2 (diff) | |
| parent | 4eac8d74ad0217f66d16fcf519e998ff35a33e00 (diff) | |
Merge pull request #19360 from vespa-engine/arnej/stop-using-feature-flag
feature flag cleanup (part 1)
Diffstat (limited to 'config-model')
| -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 |