Merge pull request #7491 from vespa-engine/revert-7490-revert-7472-revert-7470-revert-7424-hakonhall/enforce-cc-timeouts-in-orchestrator-2

Enforce CC timeouts in Orchestrator [4]

1 files changed, 12 insertions, 0 deletions

diff --git a/vespajlib/src/main/java/com/yahoo/time/TimeBudget.java b/vespajlib/src/main/java/com/yahoo/time/TimeBudget.java
index a7963df0208..449b0d6bd05 100644
--- a/vespajlib/src/main/java/com/yahoo/time/TimeBudget.java
+++ b/vespajlib/src/main/java/com/yahoo/time/TimeBudget.java
@@ -66,6 +66,18 @@ public class TimeBudget {
         });
     }
 
+    /** Returns the time left, possibly negative if the deadline has passed. */
+    public Optional<Duration> timeLeft() {
+        return timeout.map(timeout -> timeout.minus(timePassed()));
+    }
+
+    /** Returns the time left as a new TimeBudget. */
+    public TimeBudget timeLeftAsTimeBudget() {
+        Instant now = clock.instant();
+        Optional<Instant> deadline = deadline();
+        return new TimeBudget(clock, now, deadline.map(d -> Duration.between(now, d)));
+    }
+
     private static Duration nonNegativeBetween(Instant start, Instant end) {
         return makeNonNegative(Duration.between(start, end));
     }