From 67df906aa78a04ab2326c7f14007e94d265b00a2 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期一, 19 十月 2020 10:59:25 +0800
Subject: [PATCH] add short verify

---
 ClusterApi.go |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/ClusterApi.go b/ClusterApi.go
index 6c3c8dc..81614f8 100644
--- a/ClusterApi.go
+++ b/ClusterApi.go
@@ -13,6 +13,7 @@
 	"time"
 )
 
+//鍒濆鍖栭厤缃枃浠�
 func InitYml(configPath string) (bool, error) {
 	v := viper.New()
 	v.SetConfigType("yml")
@@ -28,6 +29,7 @@
 	return true, nil
 }
 
+//鍚姩鏈嶅姟
 func StartServer(binPath string, ip string) bool {
 	resultMsg := CMDSC("sh " + binPath + "/elasticsearch -d")
 	if resultMsg == "杩愯澶辫触" {
@@ -37,10 +39,12 @@
 	return bool
 }
 
+//鍏抽棴鏈嶅姟
 func StopServer(binPath string) {
 
 }
 
+//鏇存崲鑺傜偣瑙掕壊
 func UpdateNodeRole(configPath string, role string) (bool, error) {
 	v := viper.New()
 	v.SetConfigType("yml")
@@ -58,9 +62,10 @@
 	if err := v.WriteConfig(); err != nil {
 		return false, err
 	}
-	return true,nil
+	return true, nil
 }
 
+//楠岃瘉璇ヨ妭鐐规槸鍚﹁鍒涘缓杩�
 func VerifyCreated(configPath string, ip string) (bool, error) {
 	v := viper.New()
 	v.SetConfigType("yml")
@@ -68,7 +73,7 @@
 	v.AddConfigPath(configPath)
 	err := v.ReadInConfig()
 	if err != nil {
-		return false, err
+		return true, err
 	}
 	hosts := v.GetStringSlice("discovery.zen.ping.unicast.hosts")
 	for _, pick := range hosts {
@@ -82,6 +87,7 @@
 	return false, nil
 }
 
+//楠岃瘉鑺傜偣鏈嶅姟鏄惁姝e父鍚姩
 func VerifyNodeServer(ip string, port string) bool {
 	b := false
 	url := "http://" + ip + ":" + port
@@ -101,6 +107,17 @@
 	return b
 }
 
+//楠岃瘉鑺傜偣鏈嶅姟鏄惁姝e父鍚姩(鐭獙璇�)
+func VerifyShortNodeServer(ip string, port string) bool {
+	url := "http://" + ip + ":" + port
+	_, err := HttpRC("GET", url, nil)
+	if err != nil {
+		return false
+	}
+	return true
+}
+
+//楠岃瘉鑺傜偣瑙掕壊
 func VerifyNodeRole(configPath string, ) (string, error) {
 	role := "slave"
 	v := viper.New()
@@ -118,6 +135,7 @@
 	return role, nil
 }
 
+//鏇存柊缁勬挱鍒楄〃
 func UpdateDiscoveryZenPingUnicastHosts(configPath string, oldIp string, newIp string) (bool, error) {
 	v := viper.New()
 	v.SetConfigType("yml")
@@ -145,6 +163,7 @@
 	return true, nil
 }
 
+//娣诲姞缁勬挱鎴愬憳
 func AddDiscoveryZenPingUnicastHosts(configPath string, ip string) []string {
 	v := viper.New()
 	v.SetConfigType("yml")
@@ -166,6 +185,7 @@
 	NodeName   string `json:"nodeName"`
 }
 
+//鏌ヨ闆嗙兢淇℃伅
 func GetClusterInfo(ip string, port string) ([]NodeInfo, error) {
 	url := "http://" + ip + ":" + port + "/_cat/nodes?v"
 	buf, err := HttpRC("GET", url, nil)
@@ -198,6 +218,7 @@
 	return inf, nil
 }
 
+//鎺掗櫎鍗冲皢閫�鍑洪泦缇ょ殑鑺傜偣
 func ExcludeNode(ip string, port string) (bool, error) {
 	flag := false
 	url := "http://" + ip + ":" + port + "/_cluster/settings"

--
Gitblit v1.8.0