diff options
6 files changed, 8 insertions, 12 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java index c8479f448ba..1731d887438 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java @@ -381,14 +381,6 @@ public class DeploymentTrigger { return application; } - // TODO: Remove when we can determine why this occurs - if (jobType != JobType.component && ! application.deploying().isPresent()) { - log.warning(String.format("Want to trigger %s for %s with reason %s, but this application is not " + - "currently deploying a change", - jobType, application, cause)); - return application; - } - if ( ! deploysTo(application, jobType)) { return application; } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiHandler.java index 7ea82881014..6109ad5e6d9 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiHandler.java @@ -113,6 +113,7 @@ public class ScrewdriverApiHandler extends LoggingRequestHandler { .orElse(JobType.component); // Since this is a manual operation we likely want it to trigger as soon as possible so we add it at to the // front of the queue + // TODO: This does not record the triggering event controller.applications().deploymentTrigger().buildSystem().addJob(application.get().id(), jobType, true); Slime slime = new Slime(); diff --git a/document/src/main/java/com/yahoo/document/idstring/IdString.java b/document/src/main/java/com/yahoo/document/idstring/IdString.java index c58f2070e31..0ca26f29e86 100644 --- a/document/src/main/java/com/yahoo/document/idstring/IdString.java +++ b/document/src/main/java/com/yahoo/document/idstring/IdString.java @@ -12,7 +12,7 @@ import java.util.OptionalInt; /** * To be used with DocumentId constructor. * - * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> + * @author Einar M R Rosenvinge */ public abstract class IdString { diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/ANDPolicy.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/ANDPolicy.java index 2a725afbafd..54bd2faa8af 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/ANDPolicy.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/ANDPolicy.java @@ -15,7 +15,7 @@ import java.util.List; * all configured recipients, or it can be configured using the policy parameter (i.e. a string following the name of * the policy). Note that configured recipients take precedence over recipients configured in the parameter string. * - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> + * @author Simon Thoresen */ public class ANDPolicy implements DocumentProtocolRoutingPolicy { diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocolRoutingPolicy.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocolRoutingPolicy.java index d95a3d8b73a..574370d14e8 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocolRoutingPolicy.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocolRoutingPolicy.java @@ -12,5 +12,7 @@ import java.util.TreeMap; * @author thomasg */ public interface DocumentProtocolRoutingPolicy extends RoutingPolicy { - public MetricSet getMetrics(); + + MetricSet getMetrics(); + } diff --git a/messagebus/src/main/java/com/yahoo/messagebus/routing/test/CustomPolicy.java b/messagebus/src/main/java/com/yahoo/messagebus/routing/test/CustomPolicy.java index 9f5686cb27b..7aab6362717 100755 --- a/messagebus/src/main/java/com/yahoo/messagebus/routing/test/CustomPolicy.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/routing/test/CustomPolicy.java @@ -12,7 +12,7 @@ import java.util.ArrayList; import java.util.List; /** - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> + * @author Simon Thoresen */ public class CustomPolicy implements RoutingPolicy { @@ -54,4 +54,5 @@ public class CustomPolicy implements RoutingPolicy { @Override public void destroy() { } + } |