This is an automated email from the ASF dual-hosted git repository.
journey pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 3e4c221 delete lombok (#1567)
3e4c221 is described below
commit 3e4c221463c62961a80a51111a6a04e050f2af23
Author: Tboy <guo.ji...@immomo.com>
AuthorDate: Wed Dec 25 12:25:40 2019 +0800
delete lombok (#1567)
* fix #1515
* sleep when resource in not satisfy. fix #1522
* add sleep 1s for no command
* fix MasterBaseTaskExecThread submit method bug
* updates
* add log
* delete lombok
---
.../common/queue/TaskQueueZkImpl.java | 26 ++------
.../common/zk/ZookeeperConfig.java | 77 +++++++++++++++++-----
2 files changed, 69 insertions(+), 34 deletions(-)
diff --git
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/queue/TaskQueueZkImpl.java
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/queue/TaskQueueZkImpl.java
index 9bc7359..5eca993 100644
---
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/queue/TaskQueueZkImpl.java
+++
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/queue/TaskQueueZkImpl.java
@@ -17,26 +17,16 @@
package org.apache.dolphinscheduler.common.queue;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.retry.ExponentialBackoffRetry;
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.utils.Bytes;
import org.apache.dolphinscheduler.common.utils.IpUtils;
import org.apache.dolphinscheduler.common.utils.OSUtils;
-import org.apache.dolphinscheduler.common.zk.AbstractZKClient;
-import org.apache.curator.framework.CuratorFramework;
import org.apache.dolphinscheduler.common.zk.DefaultEnsembleProvider;
import org.apache.dolphinscheduler.common.zk.ZookeeperConfig;
import org.apache.zookeeper.CreateMode;
@@ -44,7 +34,7 @@ import org.apache.zookeeper.data.Stat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static
org.apache.dolphinscheduler.common.utils.Preconditions.checkNotNull;
+import java.util.*;
/**
* A singleton of a task queue implemented with zookeeper
@@ -421,12 +411,11 @@ public class TaskQueueZkImpl implements ITaskQueue {
logger.error("load zookeeper properties file failed, system exit");
System.exit(-1);
}
- zookeeperConfig = ZookeeperConfig.getFromConf(conf);
- zkClient = CuratorFrameworkFactory.builder().ensembleProvider(new
DefaultEnsembleProvider(checkNotNull(zookeeperConfig.getServerList(),
"zookeeper quorum can't be null")))
- .retryPolicy(new
ExponentialBackoffRetry(zookeeperConfig.getBaseSleepTimeMs(),
zookeeperConfig.getMaxRetries(), zookeeperConfig.getMaxSleepMs()))
- .sessionTimeoutMs(zookeeperConfig.getSessionTimeoutMs())
- .connectionTimeoutMs(zookeeperConfig.getConnectionTimeoutMs())
+ zkClient = CuratorFrameworkFactory.builder().ensembleProvider(new
DefaultEnsembleProvider(conf.getString("zookeeper.quorum")))
+ .retryPolicy(new
ExponentialBackoffRetry(conf.getInt("zookeeper.retry.base.sleep"),
conf.getInt("zookeeper.retry.maxtime"),
conf.getInt("zookeeper.retry.max.sleep")))
+ .sessionTimeoutMs(conf.getInt("zookeeper.session.timeout"))
+
.connectionTimeoutMs(conf.getInt("zookeeper.connection.timeout"))
.build();
zkClient.start();
@@ -472,8 +461,7 @@ public class TaskQueueZkImpl implements ITaskQueue {
* @return
*/
public String getTasksPath(String key){
- return zookeeperConfig.getDsRoot() + Constants.SINGLE_SLASH + key;
+ return "/dolphinscheduler" + Constants.SINGLE_SLASH + key;
}
-
}
diff --git
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/zk/ZookeeperConfig.java
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/zk/ZookeeperConfig.java
index 6e471bb..a90a147 100644
---
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/zk/ZookeeperConfig.java
+++
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/zk/ZookeeperConfig.java
@@ -16,11 +16,6 @@
*/
package org.apache.dolphinscheduler.common.zk;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.apache.commons.configuration.Configuration;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.PropertySource;
import org.springframework.stereotype.Component;
@@ -29,10 +24,6 @@ import org.springframework.stereotype.Component;
* zookeeper conf
*/
@Component
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
@PropertySource("classpath:zookeeper.properties")
public class ZookeeperConfig {
@@ -58,14 +49,70 @@ public class ZookeeperConfig {
@Value("${zookeeper.connection.digest: }")
private String digest;
- //ds scheduler install config
@Value("${zookeeper.dolphinscheduler.root:/dolphinscheduler}")
private String dsRoot;
- public static ZookeeperConfig getFromConf(Configuration conf){
- return
ZookeeperConfig.builder().serverList(conf.getString("zookeeper.quorum")).baseSleepTimeMs(conf.getInt("zookeeper.retry.base.sleep"))
-
.maxSleepMs(conf.getInt("zookeeper.retry.max.sleep")).maxRetries(conf.getInt("zookeeper.retry.maxtime"))
-
.sessionTimeoutMs(conf.getInt("zookeeper.session.timeout")).connectionTimeoutMs(conf.getInt("zookeeper.connection.timeout"))
-
.dsRoot(conf.getString("zookeeper.dolphinscheduler.root")).build();
+ public String getServerList() {
+ return serverList;
+ }
+
+ public void setServerList(String serverList) {
+ this.serverList = serverList;
+ }
+
+ public int getBaseSleepTimeMs() {
+ return baseSleepTimeMs;
+ }
+
+ public void setBaseSleepTimeMs(int baseSleepTimeMs) {
+ this.baseSleepTimeMs = baseSleepTimeMs;
+ }
+
+ public int getMaxSleepMs() {
+ return maxSleepMs;
+ }
+
+ public void setMaxSleepMs(int maxSleepMs) {
+ this.maxSleepMs = maxSleepMs;
+ }
+
+ public int getMaxRetries() {
+ return maxRetries;
+ }
+
+ public void setMaxRetries(int maxRetries) {
+ this.maxRetries = maxRetries;
+ }
+
+ public int getSessionTimeoutMs() {
+ return sessionTimeoutMs;
+ }
+
+ public void setSessionTimeoutMs(int sessionTimeoutMs) {
+ this.sessionTimeoutMs = sessionTimeoutMs;
+ }
+
+ public int getConnectionTimeoutMs() {
+ return connectionTimeoutMs;
+ }
+
+ public void setConnectionTimeoutMs(int connectionTimeoutMs) {
+ this.connectionTimeoutMs = connectionTimeoutMs;
+ }
+
+ public String getDigest() {
+ return digest;
+ }
+
+ public void setDigest(String digest) {
+ this.digest = digest;
+ }
+
+ public String getDsRoot() {
+ return dsRoot;
+ }
+
+ public void setDsRoot(String dsRoot) {
+ this.dsRoot = dsRoot;
}
}
\ No newline at end of file
