From f6ca7bb43270474fa876ff6ba62c6b2113b045ad Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期五, 31 五月 2024 14:03:29 +0800
Subject: [PATCH] Optimize day and night algorithm, format date and time, batch process by date.
---
ClusterApi.go | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/ClusterApi.go b/ClusterApi.go
index d1059b5..57d35e4 100644
--- a/ClusterApi.go
+++ b/ClusterApi.go
@@ -5,12 +5,13 @@
"encoding/json"
"errors"
"fmt"
- "github.com/spf13/viper"
"io/ioutil"
"net/http"
"os/exec"
"strings"
"time"
+
+ "github.com/spf13/viper"
)
//鍒濆鍖栭厤缃枃浠�
@@ -30,7 +31,7 @@
}
//鍒濆鍖栫储寮�
-func InitIndex(indexPath string) (bool) {
+func InitIndex(indexPath string) bool {
resultMsg := CMDSC("sh " + indexPath + "/indexInit.sh")
if resultMsg == "杩愯澶辫触" {
return false
@@ -44,8 +45,7 @@
if resultMsg == "杩愯澶辫触" {
return false
}
- b := VerifyNodeServer(ip, port)
- return b
+ return true
}
//鍏抽棴鏈嶅姟
@@ -56,6 +56,7 @@
if resultMsg == "杩愯澶辫触" {
return true
}
+ time.Sleep(time.Second * 3)
}
bs := VerifyShortNodeServer(ip, port)
return bs
@@ -82,8 +83,25 @@
return true, nil
}
+//鏇存崲鑺傜偣闆嗙兢鍚嶇О
+func UpdateClusterName(configPath string, name string) (bool, error) {
+ v := viper.New()
+ v.SetConfigType("yml")
+ v.SetConfigName("elasticsearch")
+ v.AddConfigPath(configPath)
+ err := v.ReadInConfig()
+ if err != nil {
+ return false, err
+ }
+ v.Set("cluster.name", name)
+ if err := v.WriteConfig(); err != nil {
+ return false, err
+ }
+ return true, nil
+}
+
//楠岃瘉璇ヨ妭鐐规槸鍚﹁浣跨敤杩�
-func VerifyCreated(configPath string, ip string) (bool, error) {
+func VerifyCreated(configPath string) (bool, error) {
v := viper.New()
v.SetConfigType("yml")
v.SetConfigName("elasticsearch")
@@ -93,19 +111,14 @@
return true, err
}
hosts := v.GetStringSlice("discovery.zen.ping.unicast.hosts")
- for _, pick := range hosts {
- if pick == ip {
- return true, errors.New("璇ヨ妭鐐瑰凡缁忚鎵ц鈥滃垱寤洪泦缇も��")
- }
- }
if len(hosts) > 1 {
- return true, errors.New("璇ヨ妭鐐瑰凡缁忚鎵ц鈥滃姞鍏ラ泦缇も��")
+ return true, errors.New("璇ヨ妭鐐瑰凡缁忚浣跨敤")
}
return false, nil
}
//楠岃瘉鑺傜偣鏈嶅姟鏄惁姝ｅ父鍚姩
-func VerifyNodeServer(ip string, port string) bool {
+func VerifyNodeServer(ip string, port string, waitTime int) bool {
b := false
url := "http://" + ip + ":" + port
for i := 1; i < 3; i++ {
@@ -113,7 +126,7 @@
if err != nil {
b = false
if i < 3 {
- time.Sleep(time.Second * 10)
+ time.Sleep(time.Second * time.Duration(waitTime))
continue
}
} else {
@@ -135,7 +148,7 @@
}
//楠岃瘉鑺傜偣瑙掕壊
-func VerifyNodeRole(configPath string, ) (string, error) {
+func VerifyNodeRole(configPath string) (string, error) {
role := "slave"
v := viper.New()
v.SetConfigType("yml")
--
Gitblit v1.8.0