Commit 0420afd8 authored by duanjinfei's avatar duanjinfei

update defer time ticker stop

parent a62b4c2e
......@@ -30,6 +30,7 @@ func NewModelHandler(dockerOp *operate.DockerOp) *ModelHandler {
func (m *ModelHandler) MonitorModelInfo() {
ticker := time.NewTicker(time.Second * 1)
defer ticker.Stop()
for {
select {
case <-ticker.C:
......@@ -122,6 +123,7 @@ func (m *ModelHandler) GetRpcModelsResp() (*nodemanagerV2.ModelsInfo, error) {
func (m *ModelHandler) MonitorModelStatus() {
ticker := time.NewTicker(time.Second * 5)
defer ticker.Stop()
for {
select {
case <-ticker.C:
......
......@@ -103,6 +103,7 @@ func (m *MonitorNm) monitorNmClient() {
func (m *MonitorNm) monitorNodeManagerSeed() {
ticker := time.NewTicker(time.Second * 1)
defer ticker.Stop()
for {
select {
case <-ticker.C:
......
......@@ -231,6 +231,7 @@ func (n *NodeManagerHandler) MonitorImageOp(op *nodemanagerV2.ModelOperate) {
}
model.OpTime = time.Now().Unix()
ticker := time.NewTicker(time.Second * 2)
defer ticker.Stop()
isOp := false
switch op.Operate {
case nodemanagerV2.ModelOperateType_INSTALL:
......@@ -349,8 +350,8 @@ func (n *NodeManagerHandler) MonitorImageOp(op *nodemanagerV2.ModelOperate) {
}
func (n *NodeManagerHandler) MonitorStandardTaskWorker() {
//ticker := time.NewTicker(time.Second * 30)
ticker := time.NewTicker(time.Minute * 5)
defer ticker.Stop()
for {
select {
case <-ticker.C:
......
......@@ -73,6 +73,7 @@ func StartMonitor() {
}
ticker := time.NewTicker(time.Second * 5)
defer ticker.Stop()
for {
select {
case <-ticker.C:
......
......@@ -480,6 +480,7 @@ func (op *TaskOp) checkContainerHealthy(internalIp string, internalPort uint16)
func (op *TaskOp) waitContainerRunning(handler *TaskWorker, imageName string, internalPort uint16) error {
maxExecTime := op.GetMaxExecTime()
log.WithField("maxExecTime", maxExecTime).Info("Waiting for container running", imageName)
defer op.waitRunningTicker.Stop()
for {
select {
case <-op.waitRunningTicker.C:
......@@ -541,10 +542,11 @@ func (op *TaskOp) waitReqContainerOk(dockerOp *operate.DockerOp) error {
maxExecTime := op.GetMaxExecTime()
log.WithField("maxExecTime", maxExecTime).Info("Waiting for request container success")
var err error
defer op.waitReqTicker.Stop()
for {
select {
case <-op.waitReqTicker.C:
op.waitRunningTicker = time.NewTicker(time.Second * models.DefaultTaskTimer)
op.waitReqTicker = time.NewTicker(time.Second * models.DefaultTaskTimer)
if int64(time.Since(op.startBeforeTaskTime).Seconds()) > maxExecTime-50 {
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")
......
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