You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by do...@apache.org on 2022/10/10 09:35:00 UTC
[inlong] branch master updated: [INLONG-6119][SDK] Fix log level and improve proxylist update strategy (#6120)
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 1d99a0d23 [INLONG-6119][SDK] Fix log level and improve proxylist update strategy (#6120)
1d99a0d23 is described below
commit 1d99a0d23d6a9c4608289671c4d407dc09cc44b5
Author: xueyingzhang <86...@users.noreply.github.com>
AuthorDate: Mon Oct 10 17:34:55 2022 +0800
[INLONG-6119][SDK] Fix log level and improve proxylist update strategy (#6120)
---
.../sdk/dataproxy/config/ProxyConfigManager.java | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/config/ProxyConfigManager.java b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/config/ProxyConfigManager.java
index f0f3acc7f..3d20f3286 100644
--- a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/config/ProxyConfigManager.java
+++ b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/config/ProxyConfigManager.java
@@ -49,6 +49,7 @@ import org.apache.inlong.common.pojo.dataproxy.DataProxyNodeInfo;
import org.apache.inlong.common.pojo.dataproxy.DataProxyNodeResponse;
import org.apache.inlong.common.util.BasicAuth;
import org.apache.inlong.sdk.dataproxy.ConfigConstants;
+import org.apache.inlong.sdk.dataproxy.LoadBalance;
import org.apache.inlong.sdk.dataproxy.ProxyClientConfig;
import org.apache.inlong.sdk.dataproxy.network.ClientMgr;
import org.apache.inlong.sdk.dataproxy.network.HashRing;
@@ -59,22 +60,22 @@ import org.slf4j.LoggerFactory;
import javax.net.ssl.SSLContext;
import java.io.File;
import java.io.FileInputStream;
-import java.io.ObjectInputStream;
import java.io.FileOutputStream;
-import java.io.ObjectOutputStream;
-import java.io.FileWriter;
import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
import java.io.UnsupportedEncodingException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
-import java.util.Random;
-import java.util.List;
import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -344,7 +345,9 @@ public class ProxyConfigManager extends Thread {
newProxyInfoList.clear();
LOGGER.info("proxy IP list doesn't change, load {}", proxyEntry.getLoad());
}
- updateHashRing(proxyInfoList);
+ if (clientConfig.getLoadBalance() == LoadBalance.CONSISTENCY_HASH) {
+ updateHashRing(proxyInfoList);
+ }
} else {
LOGGER.error("proxyEntry's size is zero");
}
@@ -827,6 +830,6 @@ public class ProxyConfigManager extends Thread {
public void updateHashRing(List<HostInfo> newHosts) {
this.hashRing.updateNode(newHosts);
- LOGGER.info("update hash ring {}", hashRing.getVirtualNode2RealNode());
+ LOGGER.debug("update hash ring {}", hashRing.getVirtualNode2RealNode());
}
}