diff options
author | Martin Polden <mpolden@mpolden.no> | 2018-12-06 13:26:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-06 13:26:37 +0100 |
commit | 746df22cd09590f5dd07489d696b94c400c9353e (patch) | |
tree | 3b77ad04fd6c4ba503e09203c4e16a2a7e805fbe /controller-server/src | |
parent | 4b02253d4db532ba6ae93afbd9b236991e60f7f3 (diff) | |
parent | 721634065f324bb25d5a9f07fe4e9706479ea68e (diff) |
Merge pull request #7886 from vespa-engine/mpolden/throttled-node-failures-metric
Emit metric for throttled node failures
Diffstat (limited to 'controller-server/src')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/tenant/AthenzTenant.java | 1 | ||||
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/tenant/Tenant.java | 14 |
2 files changed, 2 insertions, 13 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/tenant/AthenzTenant.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/tenant/AthenzTenant.java index 3879e7f29ca..abe09090761 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/tenant/AthenzTenant.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/tenant/AthenzTenant.java @@ -21,7 +21,6 @@ public class AthenzTenant extends Tenant { private final Property property; private final Optional<PropertyId> propertyId; - /** * This should only be used by serialization. * Use {@link #create(TenantName, AthenzDomain, Property, Optional)}. diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/tenant/Tenant.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/tenant/Tenant.java index 98950ca2632..c6ed9f7b559 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/tenant/Tenant.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/tenant/Tenant.java @@ -5,7 +5,6 @@ package com.yahoo.vespa.hosted.controller.tenant; import com.yahoo.config.provision.TenantName; import com.yahoo.vespa.hosted.controller.api.integration.organization.Contact; -import javax.swing.text.html.Option; import java.util.Objects; import java.util.Optional; @@ -19,32 +18,23 @@ public abstract class Tenant { public static final String userPrefix = "by-"; private final TenantName name; - - private Optional<Contact> contact; + private final Optional<Contact> contact; Tenant(TenantName name, Optional<Contact> contact) { this.name = name; this.contact = contact; } - /*Tenant(TenantName name) { - this(name, Optional.empty()); - }*/ - /** Name of this tenant */ public TenantName name() { return name; } + /** Contact information for this tenant */ public Optional<Contact> contact() { return contact; } - public Tenant withContact(Optional<Contact> contact) { - this.contact = contact; - return this; - } - @Override public boolean equals(Object o) { if (this == o) return true; |