set-node-state timeout in CC

1 files changed, 7 insertions, 3 deletions

diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/VersionDependentTaskCompletion.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/VersionDependentTaskCompletion.java
index 5d6a4f66467..28df5a8e35a 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/VersionDependentTaskCompletion.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/VersionDependentTaskCompletion.java
@@ -16,10 +16,12 @@ class VersionDependentTaskCompletion {
     private final RemoteClusterControllerTask task;
     private final long deadlineTimePointMs;
 
-    VersionDependentTaskCompletion(long minimumVersion, RemoteClusterControllerTask task, long deadlineTimePointMs) {
+    VersionDependentTaskCompletion(long minimumVersion, RemoteClusterControllerTask task, long maxDeadlineTimePointMs) {
         this.minimumVersion = minimumVersion;
         this.task = task;
-        this.deadlineTimePointMs = deadlineTimePointMs;
+        this.deadlineTimePointMs = task.getDeadline().map(deadline ->
+                Math.max(0, Math.min(deadline.toEpochMilli(), maxDeadlineTimePointMs)))
+                .orElse(maxDeadlineTimePointMs);
     }
 
     long getMinimumVersion() {
@@ -30,7 +32,9 @@ class VersionDependentTaskCompletion {
         return task;
     }
 
-    long getDeadlineTimePointMs() { return deadlineTimePointMs; }
+    long getDeadlineTimePointMs() {
+        return deadlineTimePointMs;
+    }
 
     @Override
     public boolean equals(Object o) {