test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-12-02 11:47:36 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[FIX] change install node shell to test

Browse Source
This commit is contained in:
goodrain 2017-12-22 09:34:19 +08:00
parent 4cb18f49ca
commit 0042c4a0fa
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/node/masterserver/node/nodecluster.go
View File

@ -23,6 +23,7 @@ import (
"bytes"
"context"
"fmt"
"os"
"strings"
"sync"
"time"
@ -309,7 +310,7 @@ func (n *NodeCluster) checkNodeInstall(node *model.HostNode) {
node.Role = []string{"compute"}
}
role := strings.Join(node.Role, ",")
etcdConfig := n.datacenterConfig.GetConfig("ETCD")
etcdConfig := n.datacenterConfig.GetConfig("ETCD_ADDRS")
etcd := n.currentNode.InternalIP + ":2379"
if etcdConfig != nil && etcdConfig.Value != nil {
switch etcdConfig.Value.(type) {
@ -321,13 +322,22 @@ func (n *NodeCluster) checkNodeInstall(node *model.HostNode) {
etcd = strings.Join(etcdConfig.Value.([]string), "|")
}
}
cmd := "bash -c \"set " + node.ID + " " + etcd + " " + role + ";$(curl -s repo.goodrain.com/gaops/jobs/install/prepare/init.sh)\""
initshell := "dev.repo.goodrain.com/gaops/jobs/install/prepare/init.sh"
cmd := fmt.Sprintf("bash -c \"set %s %s %s;$(curl -s %s)\"", node.ID, etcd, role, initshell)
logrus.Infof("init endpoint node cmd is %s", cmd)
//日志输出文件
util.CheckAndCreateDir("/var/log/event")
if err := util.CheckAndCreateDir("/var/log/event"); err != nil {
logrus.Errorf("check and create dir /var/log/event error,%s", err.Error())
}
logFile := "/var/log/event/install_node_" + node.ID + ".log"
logfile, _ := util.OpenOrCreateFile(logFile)
logfile, err := util.OpenOrCreateFile(logFile)
if err != nil {
logrus.Errorf("check and create install node logfile error,%s", err.Error())
}
if logfile == nil {
logfile = os.Stdout
}
//结果输出buffer
var stderr bytes.Buffer
client := util.NewSSHClient(node.InternalIP, "root", node.RootPass, cmd, 22, logfile, &stderr)

6
pkg/node/masterserver/task/scheduler.go
View File

@ -58,13 +58,13 @@ func (s *Scheduler) putSchedulerChan(jb *job.Job, duration time.Duration) {
//Next 下一个调度对象
func (s *Scheduler) Next() (*job.Job, error) {
ctx, cancel := context.WithTimeout(s.ctx, time.Second*5)
ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
defer cancel()
select {
case job := <-s.cache:
return job, nil
case <-s.ctx.Done():
return nil, fmt.Errorf("context cancel")
return nil, fmt.Errorf("ctx context cancel")
case <-ctx.Done():
return nil, fmt.Errorf("time out")
}
@ -86,7 +86,7 @@ func (t *TaskEngine) startScheduler() {
if err.Error() == "time out" {
continue
}
if err.Error() == "context cancel" {
if err.Error() == "ctx context cancel" {
return
}
continue