From f4c1ad199cdd31a454a60e50661db0de1747977a Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期五, 17 四月 2020 17:35:26 +0800
Subject: [PATCH] fix last
---
controllers/swfsControllers.go | 228 ++++++--------------------------------------------------
1 files changed, 25 insertions(+), 203 deletions(-)
diff --git a/controllers/swfsControllers.go b/controllers/swfsControllers.go
index 1465b6a..5e009e0 100644
--- a/controllers/swfsControllers.go
+++ b/controllers/swfsControllers.go
@@ -3,21 +3,14 @@
import (
"fmt"
"github.com/gin-gonic/gin"
- "net/http"
- "strconv"
"strings"
"swfs/code"
"swfs/config"
+ "swfs/tools/es"
+ "swfs/tools/middleware"
+ "swfs/tools/script"
"swfs/util"
- "sync"
"time"
-)
-
-const (
- StartServerScript = "seaweedfs_start.sh"
- StopServerScript = "seaweedfs_stop.sh"
- StartScriptAsVolume = "option=1"
- StartScriptAsMaster = "option=2"
)
type SeaweedfsController struct{}
@@ -27,10 +20,8 @@
}
func (sc *SeaweedfsController) UpdateSWFSServiceController(c *gin.Context) {
- oldPeers := GetOldPeers(config.Server.ScriptPath, StartServerScript)
- newPeers := GetNewPeers()
- UpdatePeers(config.Server.ScriptPath, StartServerScript, oldPeers, newPeers)
- ReplaceLineContentBySearch(StartScriptAsVolume, config.Server.ScriptPath, StartServerScript)
+ script.ReplaceLineContentBySearch(es.GetNewPeers(), config.Peer, config.Server.ScriptPath, config.StartServerScript)
+ util.ResponseFormat(c, code.Success, config.Server.EsServerIp+"鏇存柊鎴愬姛")
}
// @Security ApiKeyAuth
@@ -47,15 +38,22 @@
var body SWFSInfo
c.BindJSON(&body)
role := body.Role
- nowPeers := GetNowPeersList()
if role == "master" {
- AsMaster(nowPeers)
+ middleware.AsMaster(role)
util.ResponseFormat(c, code.AddSuccess, "鍔犲叆鑺傜偣鎴愬姛")
return
} else if role == "volume" {
- AsVolume(nowPeers)
+ status := middleware.AsVolume()
+ if status == true {
+ util.ResponseFormat(c, code.AddSuccess, "鍔犲叆鑺傜偣鎴愬姛")
+ return
+ } else {
+ util.ResponseFormat(c, code.AddClusterInfoErr, "褰撳墠杩樻病鏈変富鑺傜偣")
+ return
+ }
+ } else if role == "master+volume" {
+ middleware.AsMaVo(role)
util.ResponseFormat(c, code.AddSuccess, "鍔犲叆鑺傜偣鎴愬姛")
- return
} else {
util.ResponseFormat(c, code.RequestParamError, "閫夋嫨鑺傜偣绫诲瀷閿欒")
return
@@ -64,192 +62,16 @@
}
func (sc *SeaweedfsController) RoleOfVolumeToMasterController(c *gin.Context) {
- AsMaster(GetNowPeersList())
+ middleware.AsMaster("master+volume")
+ util.ResponseFormat(c, code.Success, "瑙掕壊娣诲姞鎴愬姛")
}
-func (sc *SeaweedfsController) RestartMasterController(c *gin.Context) {
- StopServer(config.Server.ScriptPath)
+func (sc *SeaweedfsController) RestartServerController(c *gin.Context) {
+ script.StopServer(config.Server.ScriptPath)
+ script.StartServer(config.Server.ScriptPath)
time.Sleep(time.Second * 1)
- StartServer(config.Server.ScriptPath)
-}
-
-//鍚姩鏈嶅姟
-func StartServer(scriptPath string) {
- util.RunScript("sh " + scriptPath + StartServerScript)
-}
-
-//鍋滄鏈嶅姟
-func StopServer(scriptPath string) {
- util.RunScript("sh " + scriptPath + StopServerScript)
-}
-
-//鏍规嵁鎼滅储鍐呭鏇挎崲鏁磋鍐呭
-func ReplaceLineContentBySearch(replaceContent string, scriptPath string, scriptFile string) {
- resContent := GetNowLineContent(scriptPath+"/"+scriptFile, "option=")
- replaceStr := "sed -ie 's/" + resContent + "/" + replaceContent + "/g' " + scriptPath + "/" + scriptFile
- util.RunScript(replaceStr)
-}
-
-//鏇存柊鎵�鏈夎妭鐐圭殑鑴氭湰鍙傛暟
-func UpdateAllNodesScriptArgument(nowPeers []interface{}) {
- for _, val := range nowPeers {
- ip := val.(string)
- url := "http://" + ip + ":7020/node/api-v/swfs/updateSWFSService"
- http.Get(url)
- }
-}
-
-//璇锋眰浣滀负涓昏妭鐐规搷浣滄祦绋�
-func RequestMasterNodesOperation(nowPeers []interface{}) {
- //fmt.Println("config.Server.CoreBaseUnit", config.Server.CoreBaseUnit)
- coreBaseUnit, _ := strconv.Atoi(config.Server.CoreBaseUnit)
- //fmt.Println("nowPeers: ", nowPeers)
- //fmt.Println("coreBaseUnit: ", coreBaseUnit)
- UpdateAllNodesScriptArgument(nowPeers)
- RestartAllServer(nowPeers, coreBaseUnit)
-}
-
-//閲嶅惎鍏朵粬鑺傜偣鏈嶅姟骞堕獙璇�
-func RestartServer(ip string, timeOut int) {
- url := "http://" + ip + ":7020/node/api-v/swfs/restartMaster"
- http.Get(url)
- tick := time.Tick(1 * time.Second)
- for countdown := timeOut; countdown > 0; countdown-- {
- verificationMasterUrl := "http://" + ip + ":6333"
- verificationVolume1Url := "http://" + ip + ":6700"
- verificationVolume2Url := "http://" + ip + ":6701"
- _, masterErr := http.Get(verificationMasterUrl)
- _, volume1Err := http.Get(verificationVolume1Url)
- _, volume2Err := http.Get(verificationVolume2Url)
- if masterErr == nil && volume1Err == nil && volume2Err == nil {
- break
- }
- <-tick
- }
-}
-
-//鏋勫缓閲嶅惎娴佺▼
-func RestartAllServer(nowPeers []interface{}, coreBaseUnit int) {
- coreThread := len(nowPeers)/coreBaseUnit + 1
- masterIp := make([]string, 0)
- timeOut, _ := strconv.Atoi(config.Server.TimeOut)
- var waitGroup sync.WaitGroup
- for i, val := range nowPeers {
- ip := val.(string)
- if (i+1)%coreThread == 0 {
- masterIp = append(masterIp, strings.Split(ip, ":")[0])
- for i := 0; i < len(masterIp); i++ {
- go RestartServer(masterIp[i], timeOut)
- waitGroup.Add(1) //姣忓垱寤轰竴涓猤oroutine锛屽氨鎶婁换鍔￠槦鍒椾腑浠诲姟鐨勬暟閲�+1
- }
- waitGroup.Wait() //.Wait()杩欓噷浼氬彂鐢熼樆濉烇紝鐩村埌闃熷垪涓墍鏈夌殑浠诲姟缁撴潫灏变細瑙ｉ櫎闃诲
- masterIp = make([]string, 0)
- } else {
- masterIp = append(masterIp, strings.Split(ip, ":")[0])
- if len(nowPeers) == i+1 {
- var waitGroup sync.WaitGroup
- for i := 0; i < len(masterIp); i++ {
- go RestartServer(masterIp[i], timeOut)
- waitGroup.Add(1) //姣忓垱寤轰竴涓猤oroutine锛屽氨鎶婁换鍔￠槦鍒椾腑浠诲姟鐨勬暟閲�+1
- }
- waitGroup.Wait() //.Wait()杩欓噷浼氬彂鐢熼樆濉烇紝鐩村埌闃熷垪涓墍鏈夌殑浠诲姟缁撴潫灏变細瑙ｉ櫎闃诲
- masterIp = make([]string, 0)
- break
- }
- }
- continue
- }
-}
-
-//鑾峰彇鏈湴浠ヤ娇鐢ㄩ泦缇よ〃鍗�
-func GetOldPeers(scriptPath string, scriptFile string) string {
- return GetNowLineContent(scriptPath+"/"+scriptFile, "peers=")
-}
-
-//鑾峰彇鏌ユ壘鍐呭褰撳墠琛屽唴瀹�
-func GetNowLineContent(filePath string, searchContent string) string {
- scriptStr := "cat" + filePath + "| grep " + searchContent
- return strings.Split(util.RunScript(scriptStr), "\n")[0]
-}
-
-//浣滀负鏁版嵁鑺傜偣鍔犲叆
-func AsVolume(nowPeers []interface{}) {
- ReplaceLineContentBySearch(StartScriptAsVolume, config.Server.ScriptPath, StartServerScript)
-}
-
-//浣滀负涓昏妭鐐瑰姞鍏ワ紙榛樿鍖呭惈鏁版嵁鑺傜偣锛�
-func AsMaster(nowPeers []interface{}) {
- AddNewMasterToPeers()
- RequestMasterNodesOperation(nowPeers)
-}
-
-//鑾峰彇褰撳墠闆嗙兢鍒楄〃
-func GetNowPeersList() []interface{} {
- getUrl := "http://" + config.Server.EsServerIp + ":" + config.Server.EsServerPort + "/" + config.BasicFS.IndexName + "/_search"
- getJson := `{
- "query": {
- "bool": {
- "filter": [
- {
- "term": {
- "application":"nodeOperation"
- }
- }
- ]
- }
- },
- "size": 1
-}`
-
- buf, _ := util.EsReq("POST", getUrl, []byte(getJson))
- source, _ := util.Sourcelist(buf)
- peers := source[0]["peers"].([]interface{})
- return peers
-}
-
-//鑾峰彇褰撳墠闆嗙兢鍒楄〃鏍煎紡鍖栦俊鎭�
-func GetNewPeers() string {
- peers := GetNowPeersList()
- p := "peers=" + strings.Replace(strings.Trim(fmt.Sprint(peers), "[]"), " ", ",", -1)
- return p
-}
-
-//鏇存柊鏈湴闆嗙兢鍒楄〃
-func UpdatePeers(scriptPath string, scriptFile string, oldPeers string, newPeers string) {
- str := "sed -ie 's/" + oldPeers + "/" + newPeers + "/g' " + scriptPath + "/" + scriptFile
- util.RunScript(str)
-}
-
-//鍚戦泦缇ゅ姞鍏ユ柊鐨刴aster
-func AddNewMasterToPeers() (result bool) {
- peer := config.Server.EsServerIp + ":6333"
- addUrl := "http://" + config.Server.EsServerIp + ":" + config.Server.EsServerPort + "/" + config.BasicFS.IndexName + "/_update_by_query"
- addJson := `{
- "script": {
- "lang": "painless",
- "inline": "ctx._source.peers.add(params.newpeer)",
- "params": {
- "newpeer": "` + peer + `"
- }
- },
- "query": {
- "bool": {
- "filter": [
- {
- "term": {
- "application": "nodeOperation"
- }
- }
- ]
- }
- }
-}`
- buf, _ := util.EsReq("POST", addUrl, []byte(addJson))
- updateRes, _ := util.SourceUpdated(buf)
- if updateRes == -1 {
- result = false
- } else {
- result = true
- }
- return result
+ //fmt.Println("GetLocalStartupItem: ", GetLocalStartupItem(config.Server.ScriptPath, StartServerScript))
+ result := strings.Split(middleware.GetLocalStartupItem(config.Server.ScriptPath, config.StartServerScript), "=")[1]
+ fmt.Println("result: ", result)
+ util.ResponseFormat(c, code.Success, result)
}
--
Gitblit v1.8.0