Only log if we expire something, return 1 for success

1 files changed, 9 insertions, 6 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirer.java
index 1f3c1989324..c85383fd7f7 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirer.java
@@ -41,15 +41,18 @@ public class CloudTrialExpirer extends ControllerMaintainer {
                 .filter(this::tenantHasNoDeployments)        // no running deployments active
                 .collect(Collectors.toList());
 
-        var expiredTenantNames = expiredTenants.stream()
-                .map(Tenant::name)
-                .map(TenantName::value)
-                .collect(Collectors.joining(", "));
+        if (! expiredTenants.isEmpty()) {
+            var expiredTenantNames = expiredTenants.stream()
+                    .map(Tenant::name)
+                    .map(TenantName::value)
+                    .collect(Collectors.joining(", "));
+
+            log.info("Moving expired tenants to 'none' plan: " + expiredTenantNames);
+        }
 
-        log.info("Moving expired tenants to 'none' plan: " + expiredTenantNames);
         expireTenants(expiredTenants);
 
-        return 0;
+        return 1;
     }
 
     private boolean tenantIsCloudTenant(Tenant tenant) {