Commit 204d5b83 authored by duanjinfei's avatar duanjinfei

fix time ticker

parent d0e81c6a
...@@ -94,7 +94,7 @@ func (m *ModelHandler) MonitorModelInfo() { ...@@ -94,7 +94,7 @@ func (m *ModelHandler) MonitorModelInfo() {
if err != nil { if err != nil {
log.WithError(err).Error("Error writing models.json") log.WithError(err).Error("Error writing models.json")
} }
ticker = time.NewTicker(time.Minute * 10) ticker.Reset(time.Minute * 10)
} }
} }
} }
......
...@@ -138,7 +138,7 @@ func (m *MonitorNm) monitorNodeManagerSeed() { ...@@ -138,7 +138,7 @@ func (m *MonitorNm) monitorNodeManagerSeed() {
nodeManagerArr = append(nodeManagerArr, &NodeManager{Info: node, IsUsed: false, IsExist: true}) nodeManagerArr = append(nodeManagerArr, &NodeManager{Info: node, IsUsed: false, IsExist: true})
} }
m.IsInit = true m.IsInit = true
ticker = time.NewTicker(time.Minute * 10) ticker.Reset(time.Minute * 10)
} }
} }
} }
...@@ -195,7 +195,7 @@ func (n *NodeManagerHandler) ReportResourceMap(dockerOp *operate.DockerOp) { ...@@ -195,7 +195,7 @@ func (n *NodeManagerHandler) ReportResourceMap(dockerOp *operate.DockerOp) {
} }
params := utils.BuildParams(dockerOp.ReportModelIds, bootUpModelIds) params := utils.BuildParams(dockerOp.ReportModelIds, bootUpModelIds)
n.msgRespWorker.RegisterMsgResp(n.nodeManager, n.worker, SubmitResourceMapRes, params) n.msgRespWorker.RegisterMsgResp(n.nodeManager, n.worker, SubmitResourceMapRes, params)
ticker = time.NewTicker(time.Minute * 10) ticker.Reset(time.Minute * 10)
} }
} }
} }
......
...@@ -472,7 +472,7 @@ func (op *TaskOp) waitContainerRunning(handler *TaskWorker, imageName string, co ...@@ -472,7 +472,7 @@ func (op *TaskOp) waitContainerRunning(handler *TaskWorker, imageName string, co
for { for {
select { select {
case <-op.waitRunningTicker.C: case <-op.waitRunningTicker.C:
op.waitRunningTicker = time.NewTicker(time.Second * models.DefaultTaskTimer) op.waitRunningTicker.Reset(time.Second * models.DefaultTaskTimer)
if int64(time.Since(op.startBeforeTaskTime).Seconds()) > maxExecTime-50 { if int64(time.Since(op.startBeforeTaskTime).Seconds()) > maxExecTime-50 {
log.Errorf("%s", "The maximum execution time for this task has been exceeded") log.Errorf("%s", "The maximum execution time for this task has been exceeded")
return fmt.Errorf("%s", "The maximum execution time for this task has been exceeded") return fmt.Errorf("%s", "The maximum execution time for this task has been exceeded")
...@@ -532,7 +532,7 @@ func (op *TaskOp) waitReqContainerOk(dockerOp *operate.DockerOp) error { ...@@ -532,7 +532,7 @@ func (op *TaskOp) waitReqContainerOk(dockerOp *operate.DockerOp) error {
for { for {
select { select {
case <-op.waitReqTicker.C: case <-op.waitReqTicker.C:
op.waitReqTicker = time.NewTicker(time.Second * models.DefaultTaskTimer) op.waitReqTicker.Reset(time.Second * models.DefaultTaskTimer)
if int64(time.Since(op.startBeforeTaskTime).Seconds()) > maxExecTime-50 { if int64(time.Since(op.startBeforeTaskTime).Seconds()) > maxExecTime-50 {
log.Errorf("%s", "The maximum execution time for this task has been exceeded") log.Errorf("%s", "The maximum execution time for this task has been exceeded")
return fmt.Errorf("%s", "The maximum execution time for this task has been exceeded") return fmt.Errorf("%s", "The maximum execution time for this task has been exceeded")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment