From 95f1a2c630ce561abde787360f99c2dd94cafa9a Mon Sep 17 00:00:00 2001
From: zengqiao <zengqiao@didiglobal.com>
Date: Wed, 28 Sep 2022 19:44:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=8A=A8=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BAES=E7=B4=A2=E5=BC=95=E6=A8=A1=E7=89=88=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../km/persistence/es/ESOpClient.java         | 31 +++++++++++++++----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/es/ESOpClient.java b/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/es/ESOpClient.java
index 1200699a..c70a4df6 100644
--- a/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/es/ESOpClient.java
+++ b/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/es/ESOpClient.java
@@ -392,10 +392,7 @@ public class ESOpClient {
         return false;
     }
 
-    /**
-     * 创建索引模板
-     */
-    public boolean createIndexTemplateIfNotExist(String indexTemplateName, String config) {
+    public boolean templateExist(String indexTemplateName){
         ESClient esClient = null;
 
         try {
@@ -410,6 +407,29 @@ public class ESOpClient {
             if (null != templateConfig) {
                 return true;
             }
+        } catch (Exception e) {
+            LOGGER.warn( "method=templateExist||indexTemplateName={}||msg=exception!",
+                    indexTemplateName, e);
+        } finally {
+            if (esClient != null) {
+                this.returnESClientToPool(esClient);
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * 创建索引模板
+     */
+    public boolean createIndexTemplateIfNotExist(String indexTemplateName, String config) {
+        ESClient esClient = null;
+
+        try {
+            esClient = this.getESClientFromPool();
+
+            //存在模板就返回，不存在就创建
+            if(templateExist(indexTemplateName)){return true;}
 
             // 创建新的模板
             ESIndicesPutTemplateResponse response = esClient.admin().indices().preparePutTemplate( indexTemplateName )
@@ -417,8 +437,7 @@ public class ESOpClient {
 
             return response.getAcknowledged();
         } catch (Exception e) {
-            LOGGER.warn(
-                    "class=ESOpClient||method=createIndexTemplateIfNotExist||indexTemplateName={}||config={}||msg=exception!",
+            LOGGER.warn( "method=createIndexTemplateIfNotExist||indexTemplateName={}||config={}||msg=exception!",
                     indexTemplateName, config, e
             );
         } finally {