Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ public final class KafkaZKPoolUtils {

private static KafkaZKPoolUtils instance = null;
/** Zookeeper client connection pool. */
private static Map<String, List<KafkaZkClient>> zkCliPools = new HashMap<>();
private static Map<String, List<KafkaZkClient>> zkCliIdlePools = new HashMap<>();
/** Zookeeper client current using connection poll. */
private static Map<String, List<KafkaZkClient>> zkCliUsedPools = new HashMap<>();
/** Set pool max size. */
private static int zkCliPoolSize = SystemConfigUtils.getIntProperty("kafka.zk.limit.size");

Expand All @@ -51,6 +53,7 @@ public final class KafkaZKPoolUtils {
private static final String METRIC_GROUP_NAME = "topic-management-service";

private static String errorMessageByZookeeper = "Get pool,and available size [{}]";
private static String warningMessageByZookeeper = "Current used pool size [{}], need wait.";
private static String releaseMessageByZookeeper = "Release pool,and available size [{}]";

/** Init ZkClient pool numbers. */
Expand All @@ -59,7 +62,8 @@ public final class KafkaZKPoolUtils {
clusterAliass.put(clusterAlias, SystemConfigUtils.getProperty(clusterAlias + ".zk.list"));
}
for (Entry<String, String> entry : clusterAliass.entrySet()) {
List<KafkaZkClient> zkCliPool = new ArrayList<>(zkCliPoolSize);
List<KafkaZkClient> zkCliIdlePool = new ArrayList<>(zkCliPoolSize);
List<KafkaZkClient> zkCliUsedPool = new ArrayList<>(zkCliPoolSize);
KafkaZkClient zkc = null;
for (int i = 0; i < zkCliPoolSize; i++) {
try {
Expand All @@ -75,13 +79,14 @@ public final class KafkaZKPoolUtils {
ErrorUtils.print(KafkaZKPoolUtils.class).error("ClusterAlias[" + entry.getKey() + "] add acl has error, msg is ", e);
}
}
zkCliPool.add(zkc);
zkCliIdlePool.add(zkc);
}
} catch (Exception e) {
ErrorUtils.print(KafkaZKPoolUtils.class).error("Error initializing zookeeper, msg is ", e);
}
}
zkCliPools.put(entry.getKey(), zkCliPool);
zkCliIdlePools.put(entry.getKey(), zkCliIdlePool);
zkCliUsedPools.put(entry.getKey(), zkCliUsedPool);
}

}
Expand All @@ -96,33 +101,58 @@ public static synchronized KafkaZKPoolUtils getInstance() {

/** Reback pool one of ZkClient object. */
public synchronized KafkaZkClient getZkClient(String clusterAlias) {
List<KafkaZkClient> zkCliPool = zkCliPools.get(clusterAlias);
long nowTime = System.currentTimeMillis();
List<KafkaZkClient> zkCliIdlePool = zkCliIdlePools.get(clusterAlias);
// Connecting pool
List<KafkaZkClient> zkCliUsedPool = zkCliUsedPools.get(clusterAlias);
KafkaZkClient zkc = null;
try {
if (!zkCliPool.isEmpty()) {
zkc = zkCliPool.get(0);
zkCliPool.remove(0);
// if idle pool is not none, client can get one connection from it.
if (!zkCliIdlePool.isEmpty()) {
zkc = zkCliIdlePool.get(0);
zkCliIdlePool.remove(0);
zkCliUsedPool.add(zkc);
String osName = System.getProperties().getProperty(OperateSystem.OS_NAME.getValue());
if (osName.contains(OperateSystem.LINUX.getValue())) {
ErrorUtils.print(KafkaZKPoolUtils.class).debug(errorMessageByZookeeper, zkCliPool.size());
ErrorUtils.print(KafkaZKPoolUtils.class).debug(errorMessageByZookeeper, zkCliIdlePool.size());
} else {
ErrorUtils.print(KafkaZKPoolUtils.class).info(errorMessageByZookeeper, zkCliPool.size());
ErrorUtils.print(KafkaZKPoolUtils.class).info(errorMessageByZookeeper, zkCliIdlePool.size());
}
} else {
for (int i = 0; i < zkCliPoolSize; i++) {
}
// else if idle pool is null, and used pool have the same size as zkCliPoolSize, then we should wait.
else if (zkCliUsedPool.size() == zkCliPoolSize){
ErrorUtils.print(KafkaZKPoolUtils.class).warn(warningMessageByZookeeper, zkCliIdlePool.size());
long waitUsed = System.currentTimeMillis() - nowTime;
boolean getResource = false;
while (waitUsed< ZK_CONNECTION_TIMEOUT_MS && !getResource){
if (!zkCliIdlePool.isEmpty()){
zkc = zkCliIdlePool.get(0);
zkCliIdlePool.remove(0);
zkCliUsedPool.add(zkc);
getResource = true;
}else {
Thread.sleep(1000);
System.out.println("Sleep 1000 to wait ");
}
waitUsed = 1000 + waitUsed;
}
if(!getResource) {
System.out.println("Cannot get zookeeper connection, please increase zookeeper pool size .");
}
}
// else if idle pool is null ,and used pool size less than zkCliPoolSize, then we can create new connection.
else{
for (int i = 0; i < zkCliPoolSize-zkCliUsedPool.size(); i++) {
zkc = KafkaZkClient.apply(clusterAliass.get(clusterAlias), JaasUtils.isZkSecurityEnabled(), ZK_SESSION_TIMEOUT_MS, ZK_CONNECTION_TIMEOUT_MS, Integer.MAX_VALUE, Time.SYSTEM, METRIC_GROUP_NAME, "SessionExpireListener");
if (zkc != null) {
zkCliPool.add(zkc);
zkCliIdlePool.add(zkc);
}
}

zkc = zkCliPool.get(0);
zkCliPool.remove(0);
String osName = System.getProperties().getProperty(OperateSystem.OS_NAME.getValue());
if (osName.contains(OperateSystem.LINUX.getValue())) {
ErrorUtils.print(KafkaZKPoolUtils.class).debug(errorMessageByZookeeper, zkCliPool.size());
ErrorUtils.print(KafkaZKPoolUtils.class).debug(errorMessageByZookeeper, zkCliIdlePool.size());
} else {
ErrorUtils.print(KafkaZKPoolUtils.class).warn(errorMessageByZookeeper, zkCliPool.size());
ErrorUtils.print(KafkaZKPoolUtils.class).warn(errorMessageByZookeeper, zkCliIdlePool.size());
}
}
} catch (Exception e) {
Expand All @@ -134,15 +164,17 @@ public synchronized KafkaZkClient getZkClient(String clusterAlias) {

/** Release ZkClient object. */
public synchronized void release(String clusterAlias, KafkaZkClient zkc) {
List<KafkaZkClient> zkCliPool = zkCliPools.get(clusterAlias);
if (zkCliPool != null && zkCliPool.size() < zkCliPoolSize) {
zkCliPool.add(zkc);
List<KafkaZkClient> zkCliIdlePool = zkCliIdlePools.get(clusterAlias);
List<KafkaZkClient> zkCliUsedPool = zkCliUsedPools.get(clusterAlias);
if (zkCliIdlePool != null && zkCliIdlePool.size() < zkCliPoolSize && zkCliUsedPool !=null) {
zkCliUsedPool.remove(zkc);
zkCliIdlePool.add(zkc);
}
String osName = System.getProperties().getProperty(OperateSystem.OS_NAME.getValue());
if (osName.contains(OperateSystem.LINUX.getValue())) {
ErrorUtils.print(KafkaZKPoolUtils.class).debug(releaseMessageByZookeeper, (zkCliPool == null ? 0 : zkCliPool.size()));
ErrorUtils.print(KafkaZKPoolUtils.class).debug(releaseMessageByZookeeper, (zkCliIdlePool == null ? 0 : zkCliIdlePool.size()));
} else {
ErrorUtils.print(KafkaZKPoolUtils.class).info(releaseMessageByZookeeper, (zkCliPool == null ? 0 : zkCliPool.size()));
ErrorUtils.print(KafkaZKPoolUtils.class).info(releaseMessageByZookeeper, (zkCliIdlePool == null ? 0 : zkCliIdlePool.size()));
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,12 @@ private void topicProducerLogSizeStats() {
TopicLogSize lastTopicLogSize = dashboardServiceImpl.readLastTopicLogSize(params);
TopicLogSize topicLogSize = new TopicLogSize();
if (lastTopicLogSize == null || lastTopicLogSize.getLogsize() == 0) {
topicLogSize.setDiffval(0);
topicLogSize.setDiffval(logsize);
} else {
topicLogSize.setDiffval(logsize - lastTopicLogSize.getLogsize());
// if we get the logsize and it bigger than lasttime, we can set diffval.
if (logsize - lastTopicLogSize.getLogsize() > 0){
topicLogSize.setDiffval(logsize - lastTopicLogSize.getLogsize());
}
}
// stats producer threads
if (topicLogSize.getDiffval() > 0) {
Expand Down