Log process during contact information updates

1 files changed, 16 insertions, 4 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ContactInformationMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ContactInformationMaintainer.java
index 7e354a02832..6b2daeb1323 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ContactInformationMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ContactInformationMaintainer.java
@@ -6,14 +6,18 @@ import com.yahoo.log.LogLevel;
 import com.yahoo.vespa.hosted.controller.Controller;
 import com.yahoo.vespa.hosted.controller.LockedTenant;
 import com.yahoo.vespa.hosted.controller.TenantController;
+import com.yahoo.vespa.hosted.controller.api.integration.organization.Contact;
 import com.yahoo.vespa.hosted.controller.api.integration.organization.ContactRetriever;
 import com.yahoo.vespa.hosted.controller.tenant.Tenant;
 import com.yahoo.yolean.Exceptions;
 
 import java.time.Duration;
+import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.logging.Logger;
 
+import static java.util.logging.Level.INFO;
+
 /**
  * Periodically fetch and store contact information for tenants.
  *
@@ -34,13 +38,21 @@ public class ContactInformationMaintainer extends Maintainer {
     protected void maintain() {
         TenantController tenants = controller().tenants();
         for (Tenant tenant : tenants.asList()) {
+            log.log(INFO, "Updating contact information for " + tenant);
             try {
                 switch (tenant.type()) {
-                    case athenz: tenants.lockIfPresent(tenant.name(), LockedTenant.Athenz.class, lockedTenant ->
-                            tenants.store(lockedTenant.with(contactRetriever.getContact(lockedTenant.get().propertyId()))));
+                    case athenz:
+                        tenants.lockIfPresent(tenant.name(), LockedTenant.Athenz.class, lockedTenant -> {
+                            Contact contact = contactRetriever.getContact(lockedTenant.get().propertyId());
+                            log.log(INFO, "Contact found for " + tenant + " was " +
+                                          (Optional.of(contact).equals(tenant.contact()) ? "un" : "") + "changed");
+                            tenants.store(lockedTenant.with(contact));
+                        });
+                        return;
+                    case cloud:
                         return;
-                    case cloud: return;
-                    default: throw new IllegalArgumentException("Unexpected tenant type '" + tenant.type() + "'.");
+                    default:
+                        throw new IllegalArgumentException("Unexpected tenant type '" + tenant.type() + "'.");
                 }
             } catch (Exception e) {
                 log.log(LogLevel.WARNING, "Failed to update contact information for " + tenant + ": " +