From 0b3e8851e53d43b11d20c1f18dfbb09a20ed9ad3 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Mon, 7 Dec 2020 08:11:15 +0100 Subject: Remove support for 3.5.8, not used --- zookeeper-server/CMakeLists.txt | 1 - zookeeper-server/pom.xml | 1 - .../zookeeper-server-3.5.8/CMakeLists.txt | 4 -- zookeeper-server/zookeeper-server-3.5.8/pom.xml | 78 ---------------------- .../vespa/zookeeper/VespaZooKeeperServerImpl.java | 57 ---------------- 5 files changed, 141 deletions(-) delete mode 100644 zookeeper-server/zookeeper-server-3.5.8/CMakeLists.txt delete mode 100644 zookeeper-server/zookeeper-server-3.5.8/pom.xml delete mode 100644 zookeeper-server/zookeeper-server-3.5.8/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java (limited to 'zookeeper-server') diff --git a/zookeeper-server/CMakeLists.txt b/zookeeper-server/CMakeLists.txt index b146390046c..2dd7a56ce82 100644 --- a/zookeeper-server/CMakeLists.txt +++ b/zookeeper-server/CMakeLists.txt @@ -1,4 +1,3 @@ # Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. add_subdirectory(zookeeper-server-common) add_subdirectory(zookeeper-server-3.5.6) -add_subdirectory(zookeeper-server-3.5.8) diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml index 28f18000c2d..60065e9fff3 100644 --- a/zookeeper-server/pom.xml +++ b/zookeeper-server/pom.xml @@ -14,7 +14,6 @@ zookeeper-server-common zookeeper-server-3.5.6 - zookeeper-server-3.5.8 diff --git a/zookeeper-server/zookeeper-server-3.5.8/CMakeLists.txt b/zookeeper-server/zookeeper-server-3.5.8/CMakeLists.txt deleted file mode 100644 index 66765e34997..00000000000 --- a/zookeeper-server/zookeeper-server-3.5.8/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -install_fat_java_artifact(zookeeper-server-3.5.8) -# TODO: Needs to be included when this is the wanted default version (and other symlinks need to be removed) -#install_symlink(lib/jars/zookeeper-server-3.5.8-jar-with-dependencies.jar lib/jars/zookeeper-server-jar-with-dependencies.jar) diff --git a/zookeeper-server/zookeeper-server-3.5.8/pom.xml b/zookeeper-server/zookeeper-server-3.5.8/pom.xml deleted file mode 100644 index e4000285ffa..00000000000 --- a/zookeeper-server/zookeeper-server-3.5.8/pom.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - 4.0.0 - - com.yahoo.vespa - zookeeper-server - 7-SNAPSHOT - ../pom.xml - - zookeeper-server-3.5.8 - container-plugin - 7-SNAPSHOT - - - com.yahoo.vespa - zookeeper-server-common - ${project.version} - - - org.apache.zookeeper - zookeeper - 3.5.8 - - - org.slf4j - slf4j-jdk14 - - - org.slf4j - slf4j-log4j12 - 1.7.5 - - - junit - junit - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - -Xlint:all - -Werror - - - - - org.apache.maven.plugins - maven-surefire-plugin - - ${test.hide} - once - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - com.yahoo.vespa - bundle-plugin - true - - com.sun.management - zookeeper-server - - - - - diff --git a/zookeeper-server/zookeeper-server-3.5.8/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java b/zookeeper-server/zookeeper-server-3.5.8/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java deleted file mode 100644 index 7f5b6170947..00000000000 --- a/zookeeper-server/zookeeper-server-3.5.8/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java +++ /dev/null @@ -1,57 +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 com.yahoo.security.tls.TransportSecurityUtils; - -import java.util.logging.Level; - -import static com.yahoo.vespa.defaults.Defaults.getDefaults; -import static com.yahoo.vespa.zookeeper.Configurator.zookeeperServerHostnames; - -/** - * Writes zookeeper config and starts zookeeper server. - * - * @author Ulf Lilleengen - * @author Harald Musum - */ -public class VespaZooKeeperServerImpl extends AbstractComponent implements Runnable, VespaZooKeeperServer { - - private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(VespaZooKeeperServerImpl.class.getName()); - private final Thread zkServerThread; - private final ZookeeperServerConfig zookeeperServerConfig; - - @Inject - public VespaZooKeeperServerImpl(ZookeeperServerConfig zookeeperServerConfig) { - this.zookeeperServerConfig = zookeeperServerConfig; - new Configurator(zookeeperServerConfig).writeConfigToDisk(TransportSecurityUtils.getOptions()); - zkServerThread = new Thread(this, "zookeeper server"); - zkServerThread.start(); - } - - private void shutdown() { - zkServerThread.interrupt(); - try { - zkServerThread.join(); - } catch (InterruptedException e) { - log.log(Level.WARNING, "Error joining server thread on shutdown", e); - } - } - - @Override - public void run() { - String[] args = new String[]{getDefaults().underVespaHome(zookeeperServerConfig.zooKeeperConfigFile())}; - log.log(Level.INFO, "Starting ZooKeeper server with config file " + args[0] + - ". Trying to establish ZooKeeper quorum (members: " + zookeeperServerHostnames(zookeeperServerConfig) + ")"); - org.apache.zookeeper.server.quorum.QuorumPeerMain.main(args); - } - - @Override - public void deconstruct() { - shutdown(); - super.deconstruct(); - } - -} -- cgit v1.2.3