Always write new cluster state versions to ZooKeeper

Previously, the controller would not write the version to ZK unless the
version was published to at least one node. This could lead to problems
due to un-written version numbers being visible via the controller's REST
APIs. External observers could see versions that were not present in ZK
and that would not be stable across reelections. As a consequence, invariants
for strictly increasing version numbers would be violated from the
perspective of these external observers (in particular, our system test
framework).

1 files changed, 2 insertions, 12 deletions

diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseTest.java
index 2b37d29e2ec..355166f6a8d 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DatabaseTest.java
@@ -12,7 +12,6 @@ import com.yahoo.vdslib.state.Node;
 import com.yahoo.vdslib.state.NodeState;
 import com.yahoo.vdslib.state.NodeType;
 import com.yahoo.vdslib.state.State;
-import org.junit.After;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -27,17 +26,8 @@ public class DatabaseTest extends FleetControllerTest {
 
     private static Logger log = Logger.getLogger(DatabaseTest.class.getName());
 
-    protected Supervisor supervisor;
-
-    @After
-    public void tearDown() throws Exception {
-        if (supervisor != null) {
-            supervisor.transport().shutdown().join();
-        }
-        super.tearDown();
-    }
-
-    private void setWantedState(Node n, NodeState ns, Map<Node, NodeState> wantedStates) {
+    // Note: different semantics than FleetControllerTest.setWantedState
+    protected void setWantedState(Node n, NodeState ns, Map<Node, NodeState> wantedStates) {
         int rpcPort = fleetController.getRpcPort();
         if (supervisor == null) {
             supervisor = new Supervisor(new Transport());