Merge branch 'master' into test

nm/monitor.go

@@ -51,16 +51,6 @@ func (m *MonitorNm) monitorNmClient() {
 				taskMsgWorker.DistributionTaskWorker(4)
 				log.Info("Distribution task worker started.......................")
 
-				go func(dockerOp *operate.DockerOp) {
-					for {
-						if len(dockerOp.ReportTaskIds) > 0 {
-							params := utils.BuildParams(dockerOp.ReportTaskIds)
-							msgRespWorker.RegisterMsgResp(nodeManager, worker, SubmitResourceMapRes, params)
-							return
-						}
-					}
-				}(m.DockerOp)
-
 				msgRespWorker.RegisterMsgResp(nodeManager, worker, RegisterInfoResp, nil)
 				log.Info("------------------------Send register message ended------------------------")
 
@@ -76,6 +66,9 @@ func (m *MonitorNm) monitorNmClient() {
 				nodeManagerHandler := NewNodeManagerHandler(nodeManager, worker, msgRespWorker, taskMsgWorker)
 				log.Info("Report model info started")
 
+				go nodeManagerHandler.ReportResourceMap(m.DockerOp)
+				log.Info("Monitor resource map worker started")
+
 				go nodeManagerHandler.MonitorStandardTaskWorker()
 				log.Info("Monitor standard task worker started")
 

nm/msg_handler.go

@@ -4,6 +4,7 @@ import (
 	"example.com/m/conf"
 	"example.com/m/log"
 	"example.com/m/models"
+	"example.com/m/operate"
 	"example.com/m/utils"
 	"example.com/m/validator"
 	"fmt"
@@ -177,3 +178,17 @@ func (n *NodeManagerHandler) MonitorStandardTaskWorker() {
 		}
 	}
 }
+
+func (n *NodeManagerHandler) ReportResourceMap(dockerOp *operate.DockerOp) {
+	ticker := time.NewTicker(time.Second * 1)
+	for {
+		select {
+		case <-ticker.C:
+			if len(dockerOp.ReportTaskIds) > 0 {
+				params := utils.BuildParams(dockerOp.ReportTaskIds)
+				n.msgRespWorker.RegisterMsgResp(n.nodeManager, n.worker, SubmitResourceMapRes, params)
+				ticker = time.NewTicker(time.Minute * 10)
+			}
+		}
+	}
+}