Handle missing "lastId" items, and sleep between calls

2 files changed, 7 insertions, 4 deletions

diff --git a/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java b/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java
index 9c563306cee..63de0fd8373 100644
--- a/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java
+++ b/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java
@@ -31,6 +31,7 @@ import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.OptionalLong;
 import java.util.concurrent.Callable;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
@@ -285,7 +286,8 @@ public abstract class ControllerHttpClient {
                 }));
         return new DeploymentLog(entries,
                                  rootObject.field("active").asBool(),
-                                 rootObject.field("lastId").asLong());
+                                 rootObject.field("lastId").valid() ? OptionalLong.of(rootObject.field("lastId").asLong())
+                                                                    : OptionalLong.empty());
     }
 
     private static Slime toSlime(byte[] data) {
diff --git a/hosted-api/src/main/java/ai/vespa/hosted/api/DeploymentLog.java b/hosted-api/src/main/java/ai/vespa/hosted/api/DeploymentLog.java
index 07d93a3519b..f2da64e9403 100644
--- a/hosted-api/src/main/java/ai/vespa/hosted/api/DeploymentLog.java
+++ b/hosted-api/src/main/java/ai/vespa/hosted/api/DeploymentLog.java
@@ -2,6 +2,7 @@ package ai.vespa.hosted.api;
 
 import java.time.Instant;
 import java.util.List;
+import java.util.OptionalLong;
 
 import static java.util.Comparator.comparing;
 import static java.util.stream.Collectors.toUnmodifiableList;
@@ -15,9 +16,9 @@ public class DeploymentLog {
 
     private final List<Entry> entries;
     private final boolean active;
-    private final long last;
+    private final OptionalLong last;
 
-    public DeploymentLog(List<Entry> entries, boolean active, long last) {
+    public DeploymentLog(List<Entry> entries, boolean active, OptionalLong last) {
         this.entries = entries.stream().sorted(comparing(Entry::at)).collect(toUnmodifiableList());
         this.active = active;
         this.last = last;
@@ -31,7 +32,7 @@ public class DeploymentLog {
         return active;
     }
 
-    public long last() {
+    public OptionalLong last() {
         return last;
     }