From f541528a95fd0a8a68c4729a577ffd04b49231ee Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期三, 15 四月 2020 20:18:14 +0800
Subject: [PATCH] fix peers ip array
---
controllers/swfsControllers.go | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/controllers/swfsControllers.go b/controllers/swfsControllers.go
index 475efc0..cb6454c 100644
--- a/controllers/swfsControllers.go
+++ b/controllers/swfsControllers.go
@@ -117,19 +117,24 @@
}
//鏇存柊鎵�鏈夎妭鐐圭殑鑴氭湰鍙傛暟
-func UpdateAllNodesScriptArgument(nowPeers []interface{}) {
- for _, val := range nowPeers {
- ip := val.(string)
+func UpdateAllNodesScriptArgument(peersIp []string) {
+ for _, ip := range peersIp {
+ fmt.Println("ip: ", ip)
url := "http://" + ip + ":7020/node/api-v/swfs/updateSWFSService"
+ fmt.Println("url", url)
http.Get(url)
}
}
//璇锋眰浣滀负涓昏妭鐐规搷浣滄祦绋�
func RequestMasterNodesOperation(nowPeers []interface{}) {
+ peersIp := make([]string, 0)
+ for _, val := range nowPeers {
+ peersIp = append(peersIp, strings.Split(val.(string), ":")[0])
+ }
coreBaseUnit, _ := strconv.Atoi(config.Server.CoreBaseUnit)
- UpdateAllNodesScriptArgument(nowPeers)
- RestartAllServer(nowPeers, coreBaseUnit)
+ UpdateAllNodesScriptArgument(peersIp)
+ RestartAllServer(peersIp, coreBaseUnit)
}
//閲嶅惎鎵�鏈夎妭鐐规湇鍔″苟楠岃瘉
@@ -194,13 +199,12 @@
}
//鏋勫缓閲嶅惎娴佺▼
-func RestartAllServer(nowPeers []interface{}, coreBaseUnit int) {
- coreThread := len(nowPeers)/coreBaseUnit + 1
+func RestartAllServer(peersIp []string, coreBaseUnit int) {
+ coreThread := len(peersIp)/coreBaseUnit + 1
masterIp := make([]string, 0)
timeOut, _ := strconv.Atoi(config.Server.TimeOut)
var waitGroup sync.WaitGroup
- for i, val := range nowPeers {
- ip := val.(string)
+ for i, ip := range peersIp {
if (i+1)%coreThread == 0 {
masterIp = append(masterIp, strings.Split(ip, ":")[0])
for i := 0; i < len(masterIp); i++ {
@@ -211,7 +215,7 @@
masterIp = make([]string, 0)
} else {
masterIp = append(masterIp, strings.Split(ip, ":")[0])
- if len(nowPeers) == i+1 {
+ if len(peersIp) == i+1 {
var waitGroup sync.WaitGroup
for i := 0; i < len(masterIp); i++ {
go Restart(masterIp[i], timeOut)
@@ -249,6 +253,7 @@
func AsMaster() bool {
AddNewMasterToPeers()
nowPeers := GetNowPeersList()
+ fmt.Println("nowPeers: ", nowPeers)
RequestMasterNodesOperation(nowPeers)
return true
}
@@ -287,7 +292,7 @@
//鍚戦泦缇ゅ姞鍏ユ柊鐨刴aster
func AddNewMasterToPeers() (result bool) {
peer := config.Server.EsServerIp + ":6333"
- addUrl := "http://" + config.Server.EsServerIp + ":" + config.Server.EsServerPort + "/" + config.BasicFS.IndexName + "/_update_by_query"
+ addUrl := "http://" + config.Server.EsServerIp + ":" + config.Server.EsServerPort + "/" + config.BasicFS.IndexName + "/_update_by_query?refresh=true"
addJson := `{
"script": {
"lang": "painless",
--
Gitblit v1.8.0