From 3a511e5d749f21e5d261c3ccbbea0943b0366b2f Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Mon, 25 Jul 2022 20:59:04 +0200 Subject: No functional changes --- .../yahoo/schema/processing/CreatePositionZCurve.java | 3 +-- .../java/com/yahoo/vespa/model/admin/Logserver.java | 15 ++++----------- .../restapi/application/ApplicationApiHandler.java | 3 ++- .../main/java/com/yahoo/vespa/defaults/Defaults.java | 17 +++++++++-------- 4 files changed, 16 insertions(+), 22 deletions(-) diff --git a/config-model/src/main/java/com/yahoo/schema/processing/CreatePositionZCurve.java b/config-model/src/main/java/com/yahoo/schema/processing/CreatePositionZCurve.java index e39b78d0d9f..648ed085a54 100644 --- a/config-model/src/main/java/com/yahoo/schema/processing/CreatePositionZCurve.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/CreatePositionZCurve.java @@ -36,6 +36,7 @@ import java.util.logging.Level; */ public class CreatePositionZCurve extends Processor { + private boolean useV8GeoPositions = false; private final SDDocumentType repo; public CreatePositionZCurve(Schema schema, DeployLogger deployLogger, RankProfileRegistry rankProfileRegistry, QueryProfiles queryProfiles) { @@ -43,8 +44,6 @@ public class CreatePositionZCurve extends Processor { this.repo = schema.getDocument(); } - private boolean useV8GeoPositions = false; - @Override public void process(boolean validate, boolean documentsOnly, ModelContext.Properties properties) { this.useV8GeoPositions = properties.featureFlags().useV8GeoPositions(); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java index d5a0b97a416..6f0e5a775e9 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java @@ -7,8 +7,7 @@ import com.yahoo.vespa.model.AbstractService; import com.yahoo.vespa.model.PortAllocBridge; /** - * Represents the Logserver. There is exactly one logserver in a Vespa - * system. + * Represents the Logserver. There is exactly one logserver in a Vespa system. * * @author gjoranv * @author bjorncs @@ -42,9 +41,7 @@ public class Logserver extends AbstractService { return "exec $ROOT/bin/vespa-logserver-start " + getMyJVMArgs() + " " + getJvmOptions(); } - /** - * @return the jvm args to be used by the logserver. - */ + /** Returns the jvm args to be used by the logserver. */ private String getMyJVMArgs() { StringBuilder sb = new StringBuilder(); sb.append("--add-opens=java.base/java.io=ALL-UNNAMED"); @@ -57,9 +54,7 @@ public class Logserver extends AbstractService { return sb.toString(); } - /** - * Returns the desired base port for this service. - */ + /** Returns the desired base port for this service. */ public int getWantedPort() { return 19080; } @@ -73,9 +68,7 @@ public class Logserver extends AbstractService { return true; // TODO Support dynamic port allocation for logserver } - /** - * @return the number of ports needed by the logserver. - */ + /** Returns the number of ports needed by the logserver. */ public int getPortCount() { return 4; } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index 56eaf2f3a2e..159bfb08b33 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -1844,7 +1844,8 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler { response.setString("status", "complete"); else if (stepStatus.readyAt(instance.change()).map(controller.clock().instant()::isBefore).orElse(true)) response.setString("status", "pending"); - else response.setString("status", "running"); + else + response.setString("status", "running"); }); } else { var deploymentRun = controller.jobController().last(deploymentId.applicationId(), JobType.deploymentTo(deploymentId.zoneId())); diff --git a/defaults/src/main/java/com/yahoo/vespa/defaults/Defaults.java b/defaults/src/main/java/com/yahoo/vespa/defaults/Defaults.java index 3a169899ff1..e45ecbca57a 100644 --- a/defaults/src/main/java/com/yahoo/vespa/defaults/Defaults.java +++ b/defaults/src/main/java/com/yahoo/vespa/defaults/Defaults.java @@ -78,8 +78,7 @@ public class Defaults { try { return Integer.parseInt(port.get()); } catch (NumberFormatException e) { - throw new IllegalArgumentException("must be an integer, was '" + - port.get() + "'"); + throw new IllegalArgumentException("must be an integer, was '" + port.get() + "'"); } } @@ -97,9 +96,10 @@ public class Defaults { } /** - * Get the username to own directories, files and processes + * Get the username to own directories, files and processes. + * * @return the vespa user name - **/ + */ public String vespaUser() { return vespaUser; } @@ -108,8 +108,9 @@ public class Defaults { * Detection of the hostname is now done before starting any Vespa * programs and provided in the environment variable VESPA_HOSTNAME; * if that variable isn't set a default of "localhost" is always returned. + * * @return the vespa host name - **/ + */ public String vespaHostname() { return vespaHost; } /** @@ -159,13 +160,13 @@ public class Defaults { */ public int vespaPortBase() { return vespaPortBase; } - /** @return port number used by cloud config server (for its RPC protocol) */ + /** Returns port number used by cloud config server (for its RPC protocol) */ public int vespaConfigServerRpcPort() { return vespaPortConfigServerRpc; } - /** @return port number used by cloud config server (REST api on HTTP) */ + /** Returns port number used by cloud config server (REST api on HTTP) */ public int vespaConfigServerHttpPort() { return vespaPortConfigServerHttp; } - /** @return port number used by config proxy server (RPC protocol) */ + /** Returns port number used by config proxy server (RPC protocol) */ public int vespaConfigProxyRpcPort() { return vespaPortConfigProxyRpc; } /** Returns the defaults of this runtime environment */ -- cgit v1.2.3