From d6d8a805bfdf672ebe6fbe401031edb517fc34fe Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期四, 16 四月 2020 15:27:39 +0800
Subject: [PATCH] fix startup item

---
 controllers/swfsControllers.go |  143 +++++++++++++++++++++++++++++++++--------------
 1 files changed, 100 insertions(+), 43 deletions(-)

diff --git a/controllers/swfsControllers.go b/controllers/swfsControllers.go
index 7aff2b8..fcb3dbb 100644
--- a/controllers/swfsControllers.go
+++ b/controllers/swfsControllers.go
@@ -1,6 +1,7 @@
 package controllers
 
 import (
+	"encoding/json"
 	"fmt"
 	"github.com/gin-gonic/gin"
 	"io/ioutil"
@@ -56,7 +57,7 @@
 	c.BindJSON(&body)
 	role := body.Role
 	if role == "master" {
-		AsMaster()
+		AsMaster(role)
 		util.ResponseFormat(c, code.AddSuccess, "鍔犲叆鑺傜偣鎴愬姛")
 		return
 	} else if role == "volume" {
@@ -69,7 +70,7 @@
 			return
 		}
 	} else if role == "master+volume" {
-		AsMaVo()
+		AsMaVo(role)
 		util.ResponseFormat(c, code.AddSuccess, "鍔犲叆鑺傜偣鎴愬姛")
 	} else {
 		util.ResponseFormat(c, code.RequestParamError, "閫夋嫨鑺傜偣绫诲瀷閿欒")
@@ -78,32 +79,36 @@
 
 }
 
-func AsMaVo() {
-	AsMaster()
-	ReplaceLineContentBySearch(StartScriptAsMaVo, Option, config.Server.ScriptPath, StartServerScript)
+func AsMaVo(role string) {
+	AsMaster(role)
+	ReplaceLineContentBySearch(Option+StartScriptAsMaVo, Option, config.Server.ScriptPath, StartServerScript)
 }
 
 func (sc *SeaweedfsController) RoleOfVolumeToMasterController(c *gin.Context) {
-	AsMaster()
-	ReplaceLineContentBySearch(StartScriptAsMaVo, Option, config.Server.ScriptPath, StartServerScript)
+	AsMaster("master")
+	ReplaceLineContentBySearch(Option+StartScriptAsMaVo, Option, config.Server.ScriptPath, StartServerScript)
 }
 
 func (sc *SeaweedfsController) RestartServerController(c *gin.Context) {
 	StopServer(config.Server.ScriptPath)
-	time.Sleep(time.Second * 1)
 	StartServer(config.Server.ScriptPath)
-	result := strings.Split("=", GetLocalStartupItem(config.Server.ScriptPath, StartServerScript))[1]
+	time.Sleep(time.Second * 1)
+	//fmt.Println("GetLocalStartupItem: ", GetLocalStartupItem(config.Server.ScriptPath, StartServerScript))
+	result := strings.Split(GetLocalStartupItem(config.Server.ScriptPath, StartServerScript), "=")[1]
+	fmt.Println("result: ", result)
 	util.ResponseFormat(c, code.Success, result)
 }
 
 //鍚姩鏈嶅姟
 func StartServer(scriptPath string) {
-	util.RunScript("sh " + scriptPath + StartServerScript)
+	//fmt.Println("sh " + scriptPath + "/" + StartServerScript)
+	util.RunScript("sh " + scriptPath + "/" + StartServerScript)
 }
 
 //鍋滄鏈嶅姟
 func StopServer(scriptPath string) {
-	util.RunScript("sh " + scriptPath + StopServerScript)
+	//fmt.Println("sh " + scriptPath + "/" + StopServerScript)
+	util.RunScript("sh " + scriptPath + "/" + StopServerScript)
 }
 
 //鏍规嵁鎼滅储鍐呭鏇挎崲鏁磋鍐呭
@@ -114,101 +119,152 @@
 }
 
 //鏇存柊鎵�鏈夎妭鐐圭殑鑴氭湰鍙傛暟
-func UpdateAllNodesScriptArgument(nowPeers []interface{}) {
-	for _, val := range nowPeers {
-		ip := val.(string)
+func UpdateAllNodesScriptArgument(peersIp []string) {
+	fmt.Println("寮�濮嬫洿鏂版湰鍦伴厤缃枃浠�")
+	for _, ip := range peersIp {
+		fmt.Println("ip: ", ip)
 		url := "http://" + ip + ":7020/node/api-v/swfs/updateSWFSService"
-		http.Get(url)
+		fmt.Println("url", url)
+		resp, _ := http.Get(url)
+		fmt.Println("鏇存柊杩斿洖鐘舵�侊細", resp.StatusCode)
+		if resp.StatusCode == 200 {
+			fmt.Println("璇锋眰瀹屾瘯", resp.StatusCode)
+		}
 	}
 }
 
-//璇锋眰浣滀负涓昏妭鐐规搷浣滄祦绋�
-func RequestMasterNodesOperation(nowPeers []interface{}) {
+//璇锋眰浣滀负褰撳墠瑙掕壊鑺傜偣鎿嶄綔娴佺▼
+func RequestNodesOperation(nowPeers []interface{}, role string) {
+	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)
+	replaceContent := ""
+	if role == "master" {
+		replaceContent = Option + StartScriptAsMaster
+	} else if role == "master+volume" {
+		replaceContent = Option + StartScriptAsMaVo
+	}
+	ReplaceLineContentBySearch(replaceContent, Option, config.Server.ScriptPath, StartServerScript)
+	RestartAllServer(peersIp, coreBaseUnit)
 }
 
 //閲嶅惎鎵�鏈夎妭鐐规湇鍔″苟楠岃瘉
 func Restart(ip string, timeOut int) {
 	url := "http://" + ip + ":7020/node/api-v/swfs/restartServer"
+	var info interface{}
 	httpRes, _ := http.Get(url)
-	defer httpRes.Body.Close()
 	body, _ := ioutil.ReadAll(httpRes.Body)
-	startupItem := ""
-	if httpRes.StatusCode == 200 {
-		startupItem = string(body)
+	json.Unmarshal(body, &info)
+	res, ok := info.(map[string]interface{})
+	if !ok {
+		fmt.Println("http response interface can not change map[string]interface{}")
 	}
+	fmt.Println("res: ", res)
+	startupItem := res["data"].(string)
+	if httpRes.StatusCode != 200 {
+		return
+	}
+	fmt.Println("Restart startupItem: ", startupItem)
 	tick := time.Tick(1 * time.Second)
+	fmt.Println("鍑嗗寮�濮嬮獙璇佽妭鐐规湇鍔�")
 	for countdown := timeOut; countdown > 0; countdown-- {
-		Verification(startupItem, ip)
+		fmt.Println("绗�", countdown, "娆￠獙璇�")
+		result := Verification(startupItem, ip)
+		fmt.Println("绗竴娆￠獙璇乺esult缁撴灉锛�", result)
+		if result == true {
+			break
+		}
 		<-tick
 	}
+	fmt.Println("楠岃瘉瀹屾瘯")
 }
 
-func Verification(startupItem string, ip string) {
+//楠岃瘉鏈嶅姟鐘舵��
+func Verification(startupItem string, ip string) bool {
+	resStatu := false
+	fmt.Println("Verification startupItem: ", startupItem)
 	switch startupItem {
 	case StartScriptAsVolume:
-		verificationVolumeUrl := "http://" + ip + ":6700"
+		verificationVolumeUrl := "http://" + ip + ":6700/ui/index.html"
 		_, volume1Err := http.Get(verificationVolumeUrl)
 		if volume1Err == nil {
-			break
+			resStatu = true
 		}
 	case StartScriptAsMaster:
 		verificationMasterUrl := "http://" + ip + ":6333"
 		_, masterErr := http.Get(verificationMasterUrl)
 		if masterErr == nil {
-			break
+			resStatu = true
 		}
 	case StartScriptAsMaVo:
 		verificationMasterUrl := "http://" + ip + ":6333"
-		verificationVolumeUrl := "http://" + ip + ":6700"
+		verificationVolumeUrl := "http://" + ip + ":6700/ui/index.html"
 		_, masterErr := http.Get(verificationMasterUrl)
+		fmt.Println("masterErr", masterErr)
 		_, volume1Err := http.Get(verificationVolumeUrl)
+		fmt.Println("volume1Err", volume1Err)
 		if masterErr == nil && volume1Err == nil {
-			break
+			resStatu = true
 		}
 	}
+	return resStatu
 }
 
 //鑾峰彇鏈湴鍚姩椤�
 func GetLocalStartupItem(scriptPath string, scriptFile string) string {
 	startupItem := GetNowLineContent(scriptPath+"/"+scriptFile, Option)
-	fmt.Println(startupItem)
+	fmt.Println("startupItem: ", startupItem)
 	return startupItem
 }
 
 //鏋勫缓閲嶅惎娴佺▼
-func RestartAllServer(nowPeers []interface{}, coreBaseUnit int) {
-	coreThread := len(nowPeers)/coreBaseUnit + 1
+func RestartAllServer(peersIp []string, coreBaseUnit int) {
+	fmt.Println("寮�濮嬫瀯寤洪噸鍚祦绋�")
+	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)
+	fmt.Println("褰撳墠骞惰搴oreThread锛�", coreThread)
+	for i, ip := range peersIp {
+		fmt.Println("閲嶅惎褰撳墠缁勬湇鍔�" + ip)
 		if (i+1)%coreThread == 0 {
 			masterIp = append(masterIp, strings.Split(ip, ":")[0])
+			fmt.Println("鍔犲叆绗竴缁勫苟寮�濮嬮獙璇佺涓�缁� masterIp: ", masterIp)
 			for i := 0; i < len(masterIp); i++ {
-				go Restart(masterIp[i], timeOut)
+				fmt.Println("len masterIp: ", len(masterIp))
+				fmt.Println("绗�" + strconv.Itoa(i) + "涓嚎绋�")
+				fmt.Println("褰撳墠goroutinebe")
 				waitGroup.Add(1) //姣忓垱寤轰竴涓猤oroutine锛屽氨鎶婁换鍔￠槦鍒椾腑浠诲姟鐨勬暟閲�+1
+				fmt.Println("褰撳墠goroutineaf")
+				go Restart(masterIp[i], timeOut)
+				waitGroup.Done()
 			}
+			fmt.Println("杩欓噷涓洪樆濉烇紒锛侊紒锛侊紒")
 			waitGroup.Wait() //.Wait()杩欓噷浼氬彂鐢熼樆濉烇紝鐩村埌闃熷垪涓墍鏈夌殑浠诲姟缁撴潫灏变細瑙ｉ櫎闃诲
+			fmt.Println("褰撳墠缁勪换鍔″畬鎴�")
 			masterIp = make([]string, 0)
+			fmt.Println("娓呯┖褰撳墠缁勬垚鍛橈細", masterIp)
 		} 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)
 					waitGroup.Add(1) //姣忓垱寤轰竴涓猤oroutine锛屽氨鎶婁换鍔￠槦鍒椾腑浠诲姟鐨勬暟閲�+1
+					go Restart(masterIp[i], timeOut)
+					waitGroup.Done()
 				}
 				waitGroup.Wait() //.Wait()杩欓噷浼氬彂鐢熼樆濉烇紝鐩村埌闃熷垪涓墍鏈夌殑浠诲姟缁撴潫灏变細瑙ｉ櫎闃诲
 				masterIp = make([]string, 0)
 				break
 			}
 		}
-		continue
+
 	}
+	fmt.Println("鏈嶅姟娴佺▼鎵ц瀹屾瘯")
+
 }
 
 //鑾峰彇鏌ユ壘鍐呭褰撳墠琛屽唴瀹�
@@ -224,17 +280,18 @@
 	if nowPeers == nil || len(nowPeers) == 0 {
 		return false
 	}
-	ReplaceLineContentBySearch(StartScriptAsVolume, Option, config.Server.ScriptPath, StartServerScript)
+	ReplaceLineContentBySearch(Option+StartScriptAsVolume, Option, config.Server.ScriptPath, StartServerScript)
 	ReplaceLineContentBySearch(GetNewPeers(), Peer, config.Server.ScriptPath, StartServerScript)
 	StartServer(config.Server.ScriptPath)
 	return true
 }
 
 //浣滀负涓昏妭鐐瑰姞鍏ワ紙榛樿鍖呭惈鏁版嵁鑺傜偣锛�
-func AsMaster() bool {
+func AsMaster(role string) bool {
 	AddNewMasterToPeers()
 	nowPeers := GetNowPeersList()
-	RequestMasterNodesOperation(nowPeers)
+	fmt.Println("nowPeers: ", nowPeers)
+	RequestNodesOperation(nowPeers, role)
 	return true
 }
 
@@ -272,7 +329,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