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

[FIX] debug schedulerCache

Browse Source
This commit is contained in:
goodrain 2017-11-28 16:19:35 +08:00
parent a0d2f5b9dc
commit 7b71c0b859
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/node/option/conf.go
View File

@ -126,22 +126,18 @@ func (a *Conf) AddFlags(fs *pflag.FlagSet) {
fs.StringVar(&a.NodePath, "nodePath", "/rainbond/nodes/", "the path of node in etcd")
fs.StringVar(&a.HostIDFile, "nodeid-file", "/etc/goodrain/host_uuid.conf", "the unique ID for this node. Just specify, don't modify")
fs.StringVar(&a.OnlineNodePath, "onlineNodePath", "/rainbond/onlinenodes/", "the path of master node in etcd")
fs.StringVar(&a.Proc, "procPath", "/rainbond/proc/", "the path of proc in etcd")
fs.StringVar(&a.Proc, "procPath", "/rainbond/task/proc/", "the path of proc in etcd")
fs.StringVar(&a.HostIP, "hostIP", "", "the host ip you can define. default get ip from eth0")
fs.StringVar(&a.ExecutionRecordPath, "execRecordPath", "/acp_node/exec_record", "the path of job exec record")
fs.StringVar(&a.ExecutionRecordPath, "execRecordPath", "/rainbond/exec_record", "the path of job exec record")
fs.StringSliceVar(&a.EventLogServer, "event-log-server", []string{"127.0.0.1:6367"}, "host:port slice of event log server")
fs.StringVar(&a.K8SNode, "k8sNode", "/store/nodes/", "the path of k8s node")
fs.StringVar(&a.InstalledMarker, "installed-marker", "/etc/acp_node/check/install/success", "the path of a file for check node is installed")
fs.StringVar(&a.BuildIn, "build-in-jobs", "/store/buildin/", "the path of build-in job")
fs.StringVar(&a.CompJobStatus, "jobStatus", "/store/jobStatus/", "the path of tree node install status")
fs.StringVar(&a.BuildInExec, "build-in-exec", "/acp_node/exec_buildin/", "the path of build-in job to watch")
fs.StringVar(&a.ConfigStoragePath, "config-path", "/rainbond/acp_configs", "the path of config to store(new)")
fs.StringVar(&a.InitStatus, "init-status", "/acp_node/init_status/", "the path of init status to store")
fs.StringVar(&a.InitStatus, "init-status", "/rainbond/init_status/", "the path of init status to store")
fs.StringVar(&a.Service, "servicePath", "/traefik/backends", "the path of service info to store")
fs.StringVar(&a.Cmd, "cmdPath", "/acp_node/cmd/", "the path of cmd in etcd")
fs.StringVar(&a.Once, "oncePath", "/acp_node/once/", "the path of once in etcd")
fs.StringVar(&a.Lock, "lockPath", "/acp_node/lock/", "the path of lock in etcd")
fs.StringVar(&a.Group, "groupPath", "/acp_node/group/", "the path of group in etcd")
fs.StringVar(&a.Cmd, "cmdPath", "/rainbond/cmd/", "the path of cmd in etcd")
fs.StringVar(&a.Once, "oncePath", "/rainbond/once/", "the path of once in etcd")
fs.StringVar(&a.Lock, "lockPath", "/rainbond/lock/", "the path of lock in etcd")
fs.IntVar(&a.FailTime, "failTime", 3, "the fail time of healthy check")
fs.IntVar(&a.CheckIntervalSec, "checkInterval-second", 5, "the interval time of healthy check")
fs.StringSliceVar(&a.Etcd.Endpoints, "etcd", []string{"http://127.0.0.1:2379"}, "the path of node in etcd")

7
pkg/node/masterserver/task_engine.go
View File

@ -93,6 +93,7 @@ func (t TaskSchedulerInfo) Post() {
body, err := ffjson.Marshal(t)
if err == nil {
store.DefalutClient.Post("/rainbond-node/scheduler/taskshcedulers/"+t.TaskID+"/"+t.Node, string(body))
logrus.Infof("put a scheduler info %s:%s", t.TaskID, t.Node)
}
}
@ -586,6 +587,9 @@ func (t *TaskEngine) handleJobRecord(er *job.ExecutionRecord) {
} else { //如果是一次性任务，执行记录已经被删除，无需更新
er.CompleteHandle()
}
t.schedulerCacheLock.Lock()
defer t.schedulerCacheLock.Unlock()
delete(t.schedulerCache, task.ID+er.Node)
}
//waitScheduleTask 等待调度条件成熟
@ -800,9 +804,6 @@ func (t *TaskEngine) scheduler(taskSchedulerInfo *TaskSchedulerInfo, task *model
Status: "Start",
}
t.UpdateTask(task)
t.schedulerCacheLock.Lock()
defer t.schedulerCacheLock.Unlock()
delete(t.schedulerCache, taskSchedulerInfo.TaskID+taskSchedulerInfo.Node)
logrus.Infof("success scheduler a task %s to node %s", task.Name, taskSchedulerInfo.Node)
}