Merge branch 'master' into test

largeModel/model_handler.go

@@ -25,7 +25,7 @@ func NewModelHandler(dockerOp *operate.DockerOp) *ModelHandler {
 }
 
 func (m *ModelHandler) MonitorModelInfo() {
-	ticker := time.NewTicker(time.Second * 10)
+	ticker := time.NewTicker(time.Second * 1)
 	for {
 		select {
 		case <-ticker.C:
@@ -60,7 +60,6 @@ func (m *ModelHandler) MonitorModelInfo() {
 				continue
 			}
 			reportTaskIds := make([]uint64, 0)
-			maxLong := uint64(0)
 			for _, modelInfo := range modelInfosResp {
 				if modelInfo.ImageName == "" {
 					continue
@@ -80,14 +79,10 @@ func (m *ModelHandler) MonitorModelInfo() {
 				} else {
 					log.WithField("name", modelInfo.ImageName).Info("The image name is already")
 					reportTaskIds = append(reportTaskIds, modelInfo.TaskId)
-					if modelInfo.TaskId > maxLong {
-						maxLong = modelInfo.TaskId
-					}
 				}
 				m.dockerOp.SignApi[modelInfo.ImageName] = modelInfo.SignUrl
 			}
 			m.dockerOp.ModelsInfo = modelInfosResp
-			reportTaskIds = append(reportTaskIds, maxLong)
 			m.dockerOp.ReportTaskIds = reportTaskIds
 			ticker = time.NewTicker(time.Minute * 10)
 		}

nm/monitor.go

@@ -53,6 +53,16 @@ func (m *MonitorNm) monitorNmClient() {
 
 				proofWorker := validator.NewProofWorker()
 
+				go func(dockerOp *operate.DockerOp) {
+					for {
+						if len(dockerOp.ReportTaskIds) > 0 {
+							params := utils.BuildParams(m.DockerOp.ReportTaskIds)
+							msgRespWorker.RegisterMsgResp(nodeManager, worker, SubmitResourceMapRes, params)
+							return
+						}
+					}
+				}(m.DockerOp)
+
 				msgRespWorker.RegisterMsgResp(nodeManager, worker, RegisterInfoResp, nil)
 				log.Info("------------------------Send register message ended------------------------")
 

nm/msg_resp.go

@@ -78,9 +78,8 @@ func HeartbeatResp(params ...interface{}) *nodemanagerV1.WorkerMessage {
 func SubmitResourceMapRes(params ...interface{}) *nodemanagerV1.WorkerMessage {
 	log.Info("Submit resource map response received params: ", params)
 	taskIdIndexes := params[0].([]uint64)
-	taskIdLength := taskIdIndexes[len(taskIdIndexes)-1]
-	b := bitmap.New(taskIdLength + 1)
-	for i := 0; i < len(taskIdIndexes)-1; i++ {
+	b := bitmap.New(1000000000)
+	for i := 0; i < len(taskIdIndexes); i++ {
 		taskIdIndex := taskIdIndexes[i]
 		err := b.Set(taskIdIndex)
 		if err != nil {