diff options
| author | Tor Brede Vekterli <vekterli@yahoo-inc.com> | 2017-09-20 13:16:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-20 13:16:33 +0200 |
| commit | 5b77bed8cfe7b2d7dcc65484d640d569037453ee (patch) | |
| tree | 4b8481768838a6b8a93c8ad17860a0d5b4beef47 | |
| parent | b8e9cbb6cdad643d937de3ffbe700fa8114a8a30 (diff) | |
| parent | aed70df334740c1da22524a2d7ae906eb52c236c (diff) | |
Merge pull request #3461 from vespa-engine/vekterli/temporarily-disable-set-node-state-version-ack-dependency
Temporarily disable set-node-state version ACK dependency
2 files changed, 6 insertions, 3 deletions
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/requests/SetNodeStateRequest.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/requests/SetNodeStateRequest.java index c56ce5da352..2c094769961 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/requests/SetNodeStateRequest.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/requests/SetNodeStateRequest.java @@ -67,7 +67,9 @@ public class SetNodeStateRequest extends Request<SetResponse> { @Override public boolean hasVersionAckDependency() { - return (this.responseWait == SetUnitStateRequest.ResponseWait.WAIT_UNTIL_CLUSTER_ACKED); + // FIXME this is a temporary change while edge cases in interactions between controller + // and orchestration are sorted out. + return false; } static SetResponse setWantedState( diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/SetNodeStateTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/SetNodeStateTest.java index 88483e47f4e..0f35b96c31d 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/SetNodeStateTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/SetNodeStateTest.java @@ -374,10 +374,11 @@ public class SetNodeStateTest extends StateRestApiTest { .setNewState("user", "maintenance", "whatever reason.")); } + // FIXME requests should be tagged as version dependent; temporary workaround @Test - public void set_node_state_requests_are_by_default_tagged_as_having_version_ack_dependency() { + public void set_node_state_requests_are_by_default_not_tagged_as_having_version_ack_dependency() { SetNodeStateRequest request = createDummySetNodeStateRequest(); - assertTrue(request.hasVersionAckDependency()); + assertFalse(request.hasVersionAckDependency()); } @Test |