From b83edd843e9eddd36d57f07f919bcf6475196363 Mon Sep 17 00:00:00 2001
From: Håkon Hallingstad <hakon@oath.com>
Date: Tue, 30 Oct 2018 09:15:53 +0100
Subject: Revert "Revert "Revert "Enforce CC timeouts in Orchestrator 2"""

---
 .../utils/staterestapi/requests/SetUnitStateRequest.java       |  3 ---
 .../utils/staterestapi/server/JsonReader.java                  | 10 +++-------
 .../utils/staterestapi/server/RestApiHandler.java              |  2 --
 3 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'clustercontroller-utils/src')

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 27f18c3664b..a28ddb3539b 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,7 +64,4 @@ 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 dab6895cc9d..d871a8ed6bc 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,16 +33,13 @@ public class JsonReader {
     }
 
     static class SetRequestData {
-        final boolean probe;
         final Map<String, UnitState> stateMap;
         final SetUnitStateRequest.Condition condition;
         final SetUnitStateRequest.ResponseWait responseWait;
 
-        public SetRequestData(boolean probe,
-                              Map<String, UnitState> stateMap,
+        public SetRequestData(Map<String, UnitState> stateMap,
                               SetUnitStateRequest.Condition condition,
                               SetUnitStateRequest.ResponseWait responseWait) {
-            this.probe = probe;
             this.stateMap = stateMap;
             this.condition = condition;
             this.responseWait = responseWait;
@@ -52,9 +49,8 @@ public class JsonReader {
     public SetRequestData getStateRequestData(HttpRequest request) throws Exception {
         JSONObject json = new JSONObject(request.getPostContent().toString());
 
-        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 {
@@ -104,6 +100,6 @@ public class JsonReader {
             stateMap.put(type, new UnitStateImpl(code, reason));
         }
 
-        return new SetRequestData(probe, stateMap, condition, responseWait);
+        return new SetRequestData(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 46f5d964245..c38f7aec8c6 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,8 +97,6 @@ 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));
             }
-- 
cgit v1.2.3