Revert "Revert "Remove support for ZooKeeper server 3.5.6 [run-systemtest]""

4 files changed, 0 insertions, 182 deletions

diff --git a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java
deleted file mode 100644
index d614aecbad2..00000000000
--- a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.zookeeper;
-
-import com.google.inject.Inject;
-import com.yahoo.cloud.config.ZookeeperServerConfig;
-import com.yahoo.component.AbstractComponent;
-
-import java.nio.file.Path;
-
-/**
- * Starts or reconfigures zookeeper cluster
- *
- * @author hmusum
- */
-public class ReconfigurableVespaZooKeeperServer extends AbstractComponent implements VespaZooKeeperServer {
-
-    private final VespaQuorumPeer peer;
-
-    @Inject
-    public ReconfigurableVespaZooKeeperServer(Reconfigurer reconfigurer, ZookeeperServerConfig zookeeperServerConfig) {
-        this.peer = new VespaQuorumPeer();
-        reconfigurer.startOrReconfigure(zookeeperServerConfig, this);
-    }
-
-    @Override
-    public void shutdown() {
-        peer.shutdown();
-    }
-
-    public void start(Path configFilePath) {
-        peer.start(configFilePath);
-    }
-
-    @Override
-    public boolean reconfigurable() {
-        return true;
-    }
-
-}
diff --git a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/VespaQuorumPeer.java b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/VespaQuorumPeer.java
deleted file mode 100644
index 86325f587eb..00000000000
--- a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/VespaQuorumPeer.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.zookeeper;
-
-import com.yahoo.protect.Process;
-import org.apache.zookeeper.server.admin.AdminServer;
-import org.apache.zookeeper.server.quorum.QuorumPeerConfig;
-import org.apache.zookeeper.server.quorum.QuorumPeerMain;
-
-import java.io.IOException;
-import java.nio.file.Path;
-
-/**
- * Starts/stops a ZooKeeper server. Extends QuorumPeerMain to be able to call initializeAndRun() and wraps
- * exceptions so it can be used by code that does not depend on ZooKeeper.
- *
- * @author hmusum
- */
-class VespaQuorumPeer extends QuorumPeerMain {
-
-    public void start(Path path) {
-        initializeAndRun(new String[]{ path.toFile().getAbsolutePath()});
-    }
-
-    public void shutdown() {
-        if (quorumPeer != null) {
-            try {
-                quorumPeer.shutdown();
-                quorumPeer.join(); // Wait for shutdown to complete
-            } catch (RuntimeException|InterruptedException e) {
-                // If shutdown fails, we have no other option than forcing the JVM to stop and letting it be restarted.
-                //
-                // When a VespaZooKeeperServer component receives a new config, the container will try to start a new
-                // server with the new config, this will fail until the old server is deconstructed. If the old server
-                // fails to deconstruct/shut down, the new one will never start and if that happens forcing a restart is
-                // the better option.
-                Process.logAndDie("Failed to shut down ZooKeeper properly, forcing shutdown", e);
-            }
-        }
-    }
-
-    @Override
-    protected void initializeAndRun(String[] args) {
-        try {
-            super.initializeAndRun(args);
-        } catch (QuorumPeerConfig.ConfigException | IOException | AdminServer.AdminServerException e) {
-            throw new RuntimeException("Exception when initializing or running ZooKeeper server", e);
-        }
-    }
-
-}
diff --git a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java
deleted file mode 100644
index 57ae62c0ebc..00000000000
--- a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.zookeeper;
-
-import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.admin.ZooKeeperAdmin;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * @author hmusum
- */
-@SuppressWarnings("unused") // Created by injection
-public class VespaZooKeeperAdminImpl implements VespaZooKeeperAdmin {
-
-    private static final Logger log = java.util.logging.Logger.getLogger(VespaZooKeeperAdminImpl.class.getName());
-
-    @Override
-    public void reconfigure(String connectionSpec, String joiningServers, String leavingServers) throws ReconfigException {
-        try {
-            ZooKeeperAdmin zooKeeperAdmin = new ZooKeeperAdmin(connectionSpec,
-                                                               (int) sessionTimeout().toMillis(),
-                                                               (event) -> log.log(Level.INFO, event.toString()));
-            long fromConfig = -1;
-            // Using string parameters because the List variant of reconfigure fails to join empty lists (observed on 3.5.6, fixed in 3.7.0)
-            byte[] appliedConfig = zooKeeperAdmin.reconfigure(joiningServers, leavingServers, null, fromConfig, null);
-            log.log(Level.INFO, "Applied ZooKeeper config: " + new String(appliedConfig, StandardCharsets.UTF_8));
-        } catch (KeeperException e) {
-            if (retryOn(e))
-                throw new ReconfigException(e);
-            else
-                throw new RuntimeException(e);
-        } catch (IOException | InterruptedException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private static boolean retryOn(KeeperException e) {
-        return e instanceof KeeperException.ReconfigInProgress ||
-               e instanceof KeeperException.ConnectionLossException ||
-               e instanceof KeeperException.NewConfigNoQuorum;
-    }
-
-}
-
diff --git a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java
deleted file mode 100644
index 4dfcbeea444..00000000000
--- a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.zookeeper;
-
-import com.google.inject.Inject;
-import com.yahoo.cloud.config.ZookeeperServerConfig;
-import com.yahoo.component.AbstractComponent;
-
-import java.nio.file.Path;
-
-/**
- * @author Ulf Lilleengen
- * @author hmusum
- */
-public class VespaZooKeeperServerImpl extends AbstractComponent implements VespaZooKeeperServer {
-
-    private final VespaQuorumPeer peer;
-    private final ZooKeeperRunner runner;
-
-    @Inject
-    public VespaZooKeeperServerImpl(ZookeeperServerConfig zookeeperServerConfig) {
-        this.peer = new VespaQuorumPeer();
-        this.runner = new ZooKeeperRunner(zookeeperServerConfig, this);
-    }
-
-    @Override
-    public void deconstruct() {
-        runner.shutdown();
-        super.deconstruct();
-    }
-
-    @Override
-    public void shutdown() {
-        peer.shutdown();
-    }
-
-    @Override
-    public void start(Path configFilePath) {
-        peer.start(configFilePath);
-    }
-
-    @Override
-    public boolean reconfigurable() {
-        return false;
-    }
-
-}