github
/
DolphinScheduler
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

[Bug-3140]fix the deadlock between start and stop of ZKServer (#3141) 

* [Bug-3140]fix the deadlock between start and stop of ZKServer

* use Log framework to print information

* fix code smells; add path prefix of embedded zk server

* Update dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/ZKServer.java

Co-authored-by: Yichao Yang <1048262223@qq.com>

* optimize the code

Co-authored-by: Yichao Yang <1048262223@qq.com>
pull/3/MERGE
tswstarplanet 4 years ago committed by GitHub
parent
6f9970b189
commit
753ed58fb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 103 additions and 54 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 119
      dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/ZKServer.java
  2. 38
      dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/zk/ZKServerTest.java

119
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/ZKServer.java
Unescape View File

@ -16,6 +16,7 @@
*/ */
package org.apache.dolphinscheduler.service.zk; package org.apache.dolphinscheduler.service.zk;
import org.apache.dolphinscheduler.common.utils.StringUtils;
import org.apache.zookeeper.server.ZooKeeperServer; import org.apache.zookeeper.server.ZooKeeperServer;
import org.apache.zookeeper.server.ZooKeeperServerMain; import org.apache.zookeeper.server.ZooKeeperServerMain;
import org.apache.zookeeper.server.quorum.QuorumPeerConfig; import org.apache.zookeeper.server.quorum.QuorumPeerConfig;
@ -34,44 +35,62 @@ import java.util.concurrent.atomic.AtomicBoolean;
public class ZKServer { public class ZKServer {
private static final Logger logger = LoggerFactory.getLogger(ZKServer.class); private static final Logger logger = LoggerFactory.getLogger(ZKServer.class);
private static volatile PublicZooKeeperServerMain zkServer = null;
public static final int DEFAULT_ZK_TEST_PORT = 2181; public static final int DEFAULT_ZK_TEST_PORT = 2181;
private static String dataDir = null; private final AtomicBoolean isStarted = new AtomicBoolean(false);
private PublicZooKeeperServerMain zooKeeperServerMain = null;
private int port;
private static final AtomicBoolean isStarted = new AtomicBoolean(false); private String dataDir = null;
private String prefix;
public static void main(String[] args) { public static void main(String[] args) {
if(!isStarted()){ ZKServer zkServer;
ZKServer.start(); if (args.length == 0) {
zkServer = new ZKServer();
/** } else if (args.length == 1){
* register hooks, which are called before the process exits zkServer = new ZKServer(Integer.valueOf(args[0]), "");
*/ } else {
Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() { zkServer = new ZKServer(Integer.valueOf(args[0]), args[1]);
@Override }
public void run() { zkServer.registerHook();
stop(); zkServer.start();
} }
}));
}else{ public ZKServer() {
logger.info("zk server aleady started"); this(DEFAULT_ZK_TEST_PORT, "");
}
public ZKServer(int port, String prefix) {
this.port = port;
if (prefix != null && prefix.contains("/")) {
throw new IllegalArgumentException("The prefix of path may not have '/'");
} }
this.prefix = (prefix == null ? null : prefix.trim());
}
private void registerHook() {
/**
* register hooks, which are called before the process exits
*/
Runtime.getRuntime().addShutdownHook(new Thread(this::stop));
} }
/** /**
* start service * start service
*/ */
public static void start() { public void start() {
try { try {
startLocalZkServer(DEFAULT_ZK_TEST_PORT); startLocalZkServer(port);
} catch (Exception e) { } catch (Exception e) {
logger.error("Failed to start ZK: " + e); logger.error("Failed to start ZK ", e);
} }
} }
public static boolean isStarted(){ public boolean isStarted(){
return isStarted.get(); return isStarted.get();
} }
@ -94,8 +113,12 @@ public class ZKServer {
* *
* @param port The port to listen on * @param port The port to listen on
*/ */
public static void startLocalZkServer(final int port) { public void startLocalZkServer(final int port) {
String zkDataDir = System.getProperty("user.dir") +"/zookeeper_data"; String zkDataDir = System.getProperty("user.dir") + (StringUtils.isEmpty(prefix) ? StringUtils.EMPTY : ("/" + prefix)) + "/zookeeper_data";
File file = new File(zkDataDir);
if (file.exists()) {
logger.warn("The path of zk server exists");
}
logger.info("zk server starting, data dir path:{}" , zkDataDir); logger.info("zk server starting, data dir path:{}" , zkDataDir);
startLocalZkServer(port, zkDataDir, ZooKeeperServer.DEFAULT_TICK_TIME,"60"); startLocalZkServer(port, zkDataDir, ZooKeeperServer.DEFAULT_TICK_TIME,"60");
} }
@ -108,31 +131,29 @@ public class ZKServer {
* @param tickTime zk tick time * @param tickTime zk tick time
* @param maxClientCnxns zk max client connections * @param maxClientCnxns zk max client connections
*/ */
private static synchronized void startLocalZkServer(final int port, final String dataDirPath,final int tickTime,String maxClientCnxns) { private void startLocalZkServer(final int port, final String dataDirPath,final int tickTime,String maxClientCnxns) {
if (zkServer != null) { if (isStarted.compareAndSet(false, true)) {
throw new RuntimeException("Zookeeper server is already started!"); zooKeeperServerMain = new PublicZooKeeperServerMain();
} logger.info("Zookeeper data path : {} ", dataDirPath);
zkServer = new PublicZooKeeperServerMain(); dataDir = dataDirPath;
logger.info("Zookeeper data path : {} ", dataDirPath); final String[] args = new String[]{Integer.toString(port), dataDirPath, Integer.toString(tickTime), maxClientCnxns};
dataDir = dataDirPath;
final String[] args = new String[]{Integer.toString(port), dataDirPath, Integer.toString(tickTime), maxClientCnxns};
try { try {
logger.info("Zookeeper server started "); logger.info("Zookeeper server started ");
isStarted.compareAndSet(false, true); isStarted.compareAndSet(false, true);
zkServer.initializeAndRun(args); zooKeeperServerMain.initializeAndRun(args);
} catch (QuorumPeerConfig.ConfigException e) { } catch (QuorumPeerConfig.ConfigException | IOException e) {
logger.warn("Caught exception while starting ZK", e); logger.warn("Caught exception while starting ZK", e);
} catch (IOException e) { throw new RuntimeException(e);
logger.warn("Caught exception while starting ZK", e); }
} }
} }
/** /**
* Stops a local Zk instance, deleting its data directory * Stops a local Zk instance, deleting its data directory
*/ */
public static void stop() { public void stop() {
try { try {
stopLocalZkServer(true); stopLocalZkServer(true);
logger.info("zk server stopped"); logger.info("zk server stopped");
@ -147,19 +168,21 @@ public class ZKServer {
* *
* @param deleteDataDir Whether or not to delete the data directory * @param deleteDataDir Whether or not to delete the data directory
*/ */
private static synchronized void stopLocalZkServer(final boolean deleteDataDir) { private void stopLocalZkServer(final boolean deleteDataDir) {
if (zkServer != null) { if (isStarted.compareAndSet(true, false)) {
try { try {
zkServer.shutdown(); if (zooKeeperServerMain == null) {
zkServer = null; return;
}
zooKeeperServerMain.shutdown();
zooKeeperServerMain = null;
if (deleteDataDir) { if (deleteDataDir) {
org.apache.commons.io.FileUtils.deleteDirectory(new File(dataDir)); org.apache.commons.io.FileUtils.deleteDirectory(new File(dataDir));
} }
isStarted.compareAndSet(true, false);
} catch (Exception e) { } catch (Exception e) {
logger.warn("Caught exception while stopping ZK server", e); logger.warn("Caught exception while stopping ZK server", e);
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
} }
} }

38
dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/zk/ZKServerTest.java
Unescape View File

@ -18,18 +18,44 @@ package org.apache.dolphinscheduler.service.zk;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
// ZKServer is a process, can't unit test import java.util.concurrent.TimeUnit;
public class ZKServerTest { import java.util.concurrent.atomic.AtomicReference;
public class ZKServerTest {
private static final Logger log = LoggerFactory.getLogger(ZKServerTest.class);
@Test @Test
public void isStarted() { public void testRunWithDefaultPort() {
Assert.assertEquals(false, ZKServer.isStarted()); AtomicReference<ZKServer> zkServer = new AtomicReference<>();
new Thread(() -> {
zkServer.set(new ZKServer());
zkServer.get().start();
}).start();
try {
TimeUnit.SECONDS.sleep(5);
Assert.assertEquals(true, zkServer.get().isStarted());
} catch (InterruptedException e) {
log.error("Thread interrupted", e);
}
zkServer.get().stop();
} }
@Test @Test
public void stop() { public void testRunWithCustomPort() {
ZKServer.stop(); AtomicReference<ZKServer> zkServer = new AtomicReference<>();
new Thread(() -> {
zkServer.set(new ZKServer(2183, null));
zkServer.get().start();
}).start();
try {
TimeUnit.SECONDS.sleep(5);
Assert.assertEquals(true, zkServer.get().isStarted());
} catch (InterruptedException e) {
log.error("Thread interrupted", e);
}
zkServer.get().stop();
} }
} }
Write Preview
Loading…
Cancel
Save