Merge pull request #518 from Assassinxc/add-timeout-option-for-etcd-k…

…vget Add timeout option for etcd kvClient get
dromara · Jan 16, 2025 · 2422c58 · 2422c58
2 parents 855570d + 03f5157
commit 2422c58
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/common/src/main/java/org/dromara/dynamictp/common/properties/DtpProperties.java b/common/src/main/java/org/dromara/dynamictp/common/properties/DtpProperties.java
@@ -209,6 +209,8 @@ public static class Etcd {
         private String authority = "ssl";
 
         private String key;
+
+        private long timeout = 30000L;
     }
 
     private static class Holder {

diff --git a/...igcenter/starter-etcd/src/main/java/org/dromara/dynamictp/starter/etcd/util/EtcdUtil.java b/...igcenter/starter-etcd/src/main/java/org/dromara/dynamictp/starter/etcd/util/EtcdUtil.java
@@ -39,6 +39,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @author Redick01
@@ -97,7 +98,7 @@ public static Map<Object, Object> getConfigMap(final DtpProperties.Etcd etcd, fi
                 KeyValue keyValue = client(etcd)
                         .getKVClient()
                         .get(bytesOf(etcd.getKey()))
-                        .get()
+                        .get(etcd.getTimeout(), TimeUnit.MILLISECONDS)
                         .getKvs()
                         .get(0);
                 if (Objects.isNull(keyValue)) {
@@ -111,7 +112,7 @@ public static Map<Object, Object> getConfigMap(final DtpProperties.Etcd etcd, fi
                 GetResponse response = client(etcd)
                         .getKVClient()
                         .get(key, getOption)
-                        .get();
+                        .get(etcd.getTimeout(), TimeUnit.MILLISECONDS);
                 List<KeyValue> keyValues = response.getKvs();
                 Map<Object, Object> finalResultMap = resultMap;
                 keyValues.forEach(keyValue -> {