Skip to content

Commit

Permalink
MOD: update common config
Browse files Browse the repository at this point in the history
  • Loading branch information
zanglei committed Dec 31, 2018
1 parent d5b4b89 commit 5e2169f
Show file tree
Hide file tree
Showing 46 changed files with 120 additions and 1,106 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Expand Up @@ -3,3 +3,4 @@
**/output
**/logs
*.idea
*.DS_Store
12 changes: 6 additions & 6 deletions carrera-chronos/pom.xml
View file
Expand Up @@ -35,6 +35,11 @@
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
<version>3.3.6</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
Expand All @@ -45,11 +50,6 @@
<artifactId>slf4j-api</artifactId>
<version>1.7.21</version>
</dependency>
<dependency>
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
<version>3.3.6</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
Expand Down Expand Up @@ -103,7 +103,7 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>3.4.5</version>
<version>3.4.9</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
Expand Down
42 changes: 15 additions & 27 deletions carrera-common/pom.xml
View file
Expand Up @@ -67,21 +67,21 @@
<artifactId>slf4j-api</artifactId>
<version>${slf4j-version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j-version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j-version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j-version}</version>
</dependency>
<!--<dependency>-->
<!--<groupId>org.apache.logging.log4j</groupId>-->
<!--<artifactId>log4j-api</artifactId>-->
<!--<version>${log4j-version}</version>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.apache.logging.log4j</groupId>-->
<!--<artifactId>log4j-core</artifactId>-->
<!--<version>${log4j-version}</version>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.apache.logging.log4j</groupId>-->
<!--<artifactId>log4j-slf4j-impl</artifactId>-->
<!--<version>${log4j-version}</version>-->
<!--</dependency>-->

<!-- dependency for http -->
<dependency>
Expand Down Expand Up @@ -120,18 +120,6 @@
<artifactId>guava</artifactId>
<version>${guava-version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
<version>3.6.1</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.thrift</groupId>
Expand Down
24 changes: 1 addition & 23 deletions carrera-common/src/main/java/com/xiaojukeji/carrera/biz/ZkService.java
View file
@@ -1,12 +1,6 @@
package com.xiaojukeji.carrera.biz;

import com.xiaojukeji.carrera.config.v4.BrokerConfig;
import com.xiaojukeji.carrera.config.v4.CProxyConfig;
import com.xiaojukeji.carrera.config.v4.GroupConfig;
import com.xiaojukeji.carrera.config.v4.HostRegionConfig;
import com.xiaojukeji.carrera.config.v4.MonitorAssignedConfig;
import com.xiaojukeji.carrera.config.v4.PProxyConfig;
import com.xiaojukeji.carrera.config.v4.TopicConfig;
import com.xiaojukeji.carrera.config.v4.*;
import com.xiaojukeji.carrera.dynamic.ParameterDynamicZookeeper;

import java.util.List;
Expand Down Expand Up @@ -45,26 +39,14 @@ public interface ZkService {

void getAndWatchBroker(ParameterDynamicZookeeper.DataChangeCallback<BrokerConfig> callback) throws Exception;

List<TopicConfig> getAllTopic();

TopicConfig getTopic(String topic);

List<GroupConfig> getAllGroup();

GroupConfig getGroup(String group);

PProxyConfig getPProxy(String instance);

List<PProxyConfig> getAllPProxy();

CProxyConfig getCProxy(String instance);

List<CProxyConfig> getAllCProxy();

List<BrokerConfig> getAllBroker();

BrokerConfig getBroker(String brokerCluster);

boolean createOrUpdateTopic(TopicConfig config) throws Exception;

boolean deleteTopic(String topic);
Expand All @@ -85,10 +67,6 @@ public interface ZkService {

boolean deleteBroker(String brokerCluster);

boolean createOrUpdateMonitorHost(String host, HostRegionConfig config);

boolean createOrUpdateMonitorAssigned(String broker, MonitorAssignedConfig config);

List<String> getChildren(String path);

}
107 changes: 2 additions & 105 deletions carrera-common/src/main/java/com/xiaojukeji/carrera/biz/ZkServiceImpl.java
View file
@@ -1,18 +1,10 @@
package com.xiaojukeji.carrera.biz;

import com.google.common.collect.Lists;
import com.xiaojukeji.carrera.config.v4.BrokerConfig;
import com.xiaojukeji.carrera.config.v4.CProxyConfig;
import com.xiaojukeji.carrera.config.v4.GroupConfig;
import com.xiaojukeji.carrera.config.v4.HostRegionConfig;
import com.xiaojukeji.carrera.config.v4.MonitorAssignedConfig;
import com.xiaojukeji.carrera.config.v4.PProxyConfig;
import com.xiaojukeji.carrera.config.v4.TopicConfig;
import com.xiaojukeji.carrera.config.v4.*;
import com.xiaojukeji.carrera.dynamic.ParameterDynamicConfig;
import com.xiaojukeji.carrera.dynamic.ParameterDynamicZookeeper;
import com.xiaojukeji.carrera.utils.CommonFastJsonUtils;
import org.I0Itec.zkclient.exception.ZkNoNodeException;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -28,7 +20,7 @@ public class ZkServiceImpl implements ZkService {
private ParameterDynamicZookeeper zkService;

/**
* @param zkHost ip:port,ip:port
* @param zkHost ip:port,ip:port
* @param isConfigCentre
* @throws Exception
*/
Expand Down Expand Up @@ -101,101 +93,26 @@ public void getAndWatchBroker(ParameterDynamicZookeeper.DataChangeCallback<Broke
zkService.recursiveWatch(CARRERA_BROKER, callback, BrokerConfig.class);
}

@Override
public List<TopicConfig> getAllTopic() {
List<TopicConfig> allTopic = Lists.newArrayList();
List<String> topicList = zkService.getChildren(CARRERA_TOPIC);
if (CollectionUtils.isEmpty(topicList)) {
return allTopic;
}
for (String topicName : topicList) {
allTopic.add(getZkData(getTopicPath(topicName), TopicConfig.class));
}

return allTopic;
}

@Override
public TopicConfig getTopic(String topic) {
return getZkData(getTopicPath(topic), TopicConfig.class);
}

@Override
public List<GroupConfig> getAllGroup() {
List<GroupConfig> allGroup = Lists.newArrayList();
List<String> groupList = zkService.getChildren(CARRERA_GROUP);
if (CollectionUtils.isEmpty(groupList)) {
return allGroup;
}
for (String groupName : groupList) {
allGroup.add(getZkData(getGroupPath(groupName), GroupConfig.class));
}

return allGroup;
}

@Override
public GroupConfig getGroup(String group) {
return getZkData(getGroupPath(group), GroupConfig.class);
}

@Override
public List<PProxyConfig> getAllPProxy() {
List<PProxyConfig> allPProxy = Lists.newArrayList();
List<String> childList = zkService.getChildren(CARRERA_PPROXY);
if (CollectionUtils.isEmpty(childList)) {
return allPProxy;
}
for (String childPath : childList) {
allPProxy.add(getZkData(getProxyPath(CARRERA_PPROXY, childPath), PProxyConfig.class));
}

return allPProxy;
}

@Override
public PProxyConfig getPProxy(String instance) {
return getZkData(getProxyPath(CARRERA_PPROXY, instance), PProxyConfig.class);
}

@Override
public List<CProxyConfig> getAllCProxy() {
List<CProxyConfig> allCProxy = Lists.newArrayList();
List<String> childList = zkService.getChildren(CARRERA_CPROXY);
if (CollectionUtils.isEmpty(childList)) {
return allCProxy;
}
for (String childPath : childList) {
allCProxy.add(getZkData(getProxyPath(CARRERA_CPROXY, childPath), CProxyConfig.class));
}

return allCProxy;
}

@Override
public CProxyConfig getCProxy(String instance) {
return getZkData(getProxyPath(CARRERA_CPROXY, instance), CProxyConfig.class);
}

@Override
public List<BrokerConfig> getAllBroker() {
List<BrokerConfig> allBroker = Lists.newArrayList();
List<String> childList = zkService.getChildren(CARRERA_BROKER);
if (CollectionUtils.isEmpty(childList)) {
return allBroker;
}
for (String childPath : childList) {
allBroker.add(getZkData(getBrokerPath(childPath), BrokerConfig.class));
}

return allBroker;
}

@Override
public BrokerConfig getBroker(String brokerCluster) {
return getZkData(getBrokerPath(brokerCluster), BrokerConfig.class);
}

private String getTopicPath(String topic) {
return CARRERA_TOPIC + "/" + topic;
}
Expand All @@ -212,14 +129,6 @@ private String getBrokerPath(String broker) {
return CARRERA_BROKER + "/" + broker;
}

private String getMonitorHostPath(String host) {
return CARRERA_MONITHOR_HOST + "/" + host;
}

private String getMonitorAssignedPath(String broken) {
return CARRERA_MONITOR_ASSIGNED + "/" + broken;
}

@Override
public boolean createOrUpdateTopic(TopicConfig config) throws Exception {
if (!config.validate()) {
Expand Down Expand Up @@ -323,18 +232,6 @@ public boolean deleteBroker(String brokerCluster) {
return true;
}

@Override
public boolean createOrUpdateMonitorHost(String host, HostRegionConfig config) {
setZkData(getMonitorHostPath(host), config);
return true;
}

@Override
public boolean createOrUpdateMonitorAssigned(String broker, MonitorAssignedConfig config) {
setZkData(getMonitorAssignedPath(broker), config);
return true;
}

@Override
public List<String> getChildren(String path) {
return zkService.getChildren(path);
Expand Down
20 changes: 4 additions & 16 deletions carrera-common/src/main/java/com/xiaojukeji/carrera/config/v4/BrokerConfig.java
View file
@@ -1,31 +1,22 @@
package com.xiaojukeji.carrera.config.v4;

import java.util.Map;
import java.util.Set;

import com.alibaba.fastjson.TypeReference;
import com.xiaojukeji.carrera.config.ConfigurationValidator;
import com.xiaojukeji.carrera.utils.CommonFastJsonUtils;
import org.apache.commons.lang3.StringUtils;

import java.util.Map;
import java.util.Set;


public class BrokerConfig implements ConfigurationValidator, Cloneable {
private String idc;
private String brokerCluster;
private String brokerClusterAddrs;
private Map<String/*master ip:port*/, Set<String>/*slave ip:port*/> brokers;

private Map<String/*proxyCluster*/, Set<String>> pproxies;
private Map<String/*proxyCluster*/, Set<String>> cproxies;

public String getIdc() {
return idc;
}

public void setIdc(String idc) {
this.idc = idc;
}

public String getBrokerCluster() {
return brokerCluster;
}
Expand Down Expand Up @@ -69,7 +60,6 @@ public void setBrokers(Map<String, Set<String>> brokers) {
@Override
public String toString() {
return "BrokerConfig{" +
"idc='" + idc + '\'' +
", brokerCluster='" + brokerCluster + '\'' +
", brokerClusterAddrs=" + brokerClusterAddrs +
", brokers=" + brokers +
Expand All @@ -80,9 +70,7 @@ public String toString() {

@Override
public boolean validate() throws ConfigException {
if (StringUtils.isEmpty(this.idc)) {
throw new ConfigException("[BrokerConfig] idc empty, brokerCluster=" + brokerCluster);
} else if (StringUtils.isEmpty(this.brokerCluster)) {
if (StringUtils.isEmpty(this.brokerCluster)) {
throw new ConfigException("[BrokerConfig] brokerCluster empty, brokerCluster=" + brokerCluster);
} else if (StringUtils.isEmpty(this.brokerClusterAddrs)) {
throw new ConfigException("[BrokerConfig] brokerClusterAddrs empty, brokerCluster=" + brokerCluster);
Expand Down

0 comments on commit 5e2169f

Please sign in to comment.