Revert "Revert "Revert "Revert "Enforce CC timeouts in Orchestrator 2""""

3 files changed, 12 insertions, 3 deletions

diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/requests/SetUnitStateRequest.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/requests/SetUnitStateRequest.java
index a28ddb3539b..27f18c3664b 100644
--- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/requests/SetUnitStateRequest.java
+++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/requests/SetUnitStateRequest.java
@@ -64,4 +64,7 @@ public interface SetUnitStateRequest extends UnitRequest {
     ResponseWait getResponseWait();
 
     TimeBudget timeBudget();
+
+    /** A probe request is a non-committal request to see if an identical (but non-probe) request would have succeeded. */
+    boolean isProbe();
 }
diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/JsonReader.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/JsonReader.java
index d871a8ed6bc..dab6895cc9d 100644
--- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/JsonReader.java
+++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/JsonReader.java
@@ -33,13 +33,16 @@ public class JsonReader {
     }
 
     static class SetRequestData {
+        final boolean probe;
         final Map<String, UnitState> stateMap;
         final SetUnitStateRequest.Condition condition;
         final SetUnitStateRequest.ResponseWait responseWait;
 
-        public SetRequestData(Map<String, UnitState> stateMap,
+        public SetRequestData(boolean probe,
+                              Map<String, UnitState> stateMap,
                               SetUnitStateRequest.Condition condition,
                               SetUnitStateRequest.ResponseWait responseWait) {
+            this.probe = probe;
             this.stateMap = stateMap;
             this.condition = condition;
             this.responseWait = responseWait;
@@ -49,8 +52,9 @@ public class JsonReader {
     public SetRequestData getStateRequestData(HttpRequest request) throws Exception {
         JSONObject json = new JSONObject(request.getPostContent().toString());
 
-        final SetUnitStateRequest.Condition condition;
+        final boolean probe = json.has("probe") && json.getBoolean("probe");
 
+        final SetUnitStateRequest.Condition condition;
         if (json.has("condition")) {
             condition = SetUnitStateRequest.Condition.fromString(json.getString("condition"));
         } else {
@@ -100,6 +104,6 @@ public class JsonReader {
             stateMap.put(type, new UnitStateImpl(code, reason));
         }
 
-        return new SetRequestData(stateMap, condition, responseWait);
+        return new SetRequestData(probe, stateMap, condition, responseWait);
     }
 }
diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/RestApiHandler.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/RestApiHandler.java
index c38f7aec8c6..46f5d964245 100644
--- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/RestApiHandler.java
+++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/RestApiHandler.java
@@ -97,6 +97,8 @@ public class RestApiHandler implements HttpRequestHandler {
                     public ResponseWait getResponseWait() { return setRequestData.responseWait; }
                     @Override
                     public TimeBudget timeBudget() { return TimeBudget.from(clock, start, timeout); }
+                    @Override
+                    public boolean isProbe() { return setRequestData.probe; }
                 });
                 return new JsonHttpResult().setJson(jsonWriter.createJson(setResponse));
             }