Merge pull request #16480 from vespa-engine/mpolden/fix-msg

Update retirement expiry log message

1 files changed, 4 insertions, 3 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirer.java
index 3064ac2d16b..1ae0e6f6227 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirer.java
@@ -12,6 +12,7 @@ import com.yahoo.vespa.hosted.provision.NodeRepository;
 import com.yahoo.vespa.hosted.provision.node.History;
 import com.yahoo.vespa.orchestrator.OrchestrationException;
 import com.yahoo.vespa.orchestrator.Orchestrator;
+import com.yahoo.yolean.Exceptions;
 
 import java.time.Duration;
 import java.util.List;
@@ -96,7 +97,7 @@ public class RetiredExpirer extends NodeRepositoryMaintainer {
         }
 
         if (node.history().hasEventBefore(History.Event.Type.retired, clock().instant().minus(retiredExpiry))) {
-            log.info("Node " + node + " has been retired longer than " + retiredExpiry);
+            log.warning("Node " + node + " has been retired longer than " + retiredExpiry + ": Allowing removal. This may cause data loss");
             return true;
         }
 
@@ -105,10 +106,10 @@ public class RetiredExpirer extends NodeRepositoryMaintainer {
             log.info("Node " + node + " has been granted permission to be removed");
             return true;
         } catch (UncheckedTimeoutException e) {
-            log.info("Timed out trying to acquire permission to remove " + node.hostname() + ": " + e.getMessage());
+            log.warning("Timed out trying to acquire permission to remove " + node.hostname() + ": " + Exceptions.toMessageString(e));
             return false;
         } catch (OrchestrationException e) {
-            log.info("Did not get permission to remove retired " + node + ": " + e.getMessage());
+            log.info("Did not get permission to remove retired " + node + ": " + Exceptions.toMessageString(e));
             return false;
         }
     }