update report info

largeModel/model_handler.go

@@ -89,7 +89,6 @@ func (m *ModelHandler) MonitorModelInfo() {
 			m.dockerOp.ModelsInfo = modelInfosResp
 			reportTaskIds = append(reportTaskIds, maxLong)
 			m.dockerOp.ReportTaskIds = reportTaskIds
-			m.dockerOp.ModelTaskIdIndexesChan <- reportTaskIds
 			ticker = time.NewTicker(time.Minute * 10)
 		}
 	}

nm/monitor.go

@@ -6,6 +6,7 @@ import (
 	"example.com/m/log"
 	"example.com/m/models"
 	"example.com/m/operate"
+	"example.com/m/utils"
 	"example.com/m/validator"
 	nodeManagerV1 "github.com/odysseus/odysseus-protocol/gen/proto/go/nodemanager/v1"
 	"google.golang.org/grpc"
@@ -52,36 +53,17 @@ func (m *MonitorNm) monitorNmClient() {
 
 				proofWorker := validator.NewProofWorker()
 
-				// 主动上报发送设备信息
-				go func(isSelect bool) {
-					ticker := time.NewTicker(time.Millisecond)
-					isSend := false
-					for {
-						select {
-						case <-ticker.C:
-							if isSend {
-								log.Info("The once-off message is send")
-								return
-							}
-							ticker = time.NewTicker(time.Second * 20)
-							msgRespWorker.RegisterMsgResp(nodeManager, worker, RegisterInfoResp, nil)
-							time.Sleep(time.Second * 2)
-							msgRespWorker.RegisterMsgResp(nodeManager, worker, DeviceInfoResp, nil)
-							if len(m.DockerOp.ReportTaskIds) == 0 {
-								m.DockerOp.ModelTaskIdIndexesChan <- []uint64{0}
-							} else {
-								m.DockerOp.ModelTaskIdIndexesChan <- m.DockerOp.ReportTaskIds
-							}
-							isSend = true
-							log.Info("------------------------Send once-off message ended------------------------")
-						}
-					}
-				}(nodeManager.IsSelected)
+				msgRespWorker.RegisterMsgResp(nodeManager, worker, RegisterInfoResp, nil)
+				log.Info("------------------------Send register message ended------------------------")
 
-				nodeManagerHandler := NewNodeManagerHandler(nodeManager, worker, msgRespWorker, taskMsgWorker)
+				msgRespWorker.RegisterMsgResp(nodeManager, worker, DeviceInfoResp, nil)
+				log.Info("------------------------Send deviceInfo message ended------------------------")
 
-				// 上报image信息
-				go nodeManagerHandler.reportModelInfo(m.DockerOp)
+				params := utils.BuildParams(m.DockerOp.ReportTaskIds)
+				msgRespWorker.RegisterMsgResp(nodeManager, worker, SubmitResourceMapRes, params)
+				log.Info("------------------------Send once-off message ended------------------------")
+
+				nodeManagerHandler := NewNodeManagerHandler(nodeManager, worker, msgRespWorker, taskMsgWorker)
 				log.Info("Report model info started")
 
 				// 证明存储

nm/msg_handler.go

@@ -4,7 +4,6 @@ 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"
@@ -178,17 +177,3 @@ func (n *NodeManagerHandler) handlerStandardTask() {
 		}
 	}
 }
-
-func (n *NodeManagerHandler) reportModelInfo(dockerOp *operate.DockerOp) {
-	for {
-		select {
-		case taskIdIndexes := <-dockerOp.ModelTaskIdIndexesChan:
-			if !n.nodeManager.Status {
-				log.WithField("endpoint", n.nodeManager.Endpoint).Error("Node manager is down , stop report model info")
-				return
-			}
-			params := utils.BuildParams(taskIdIndexes)
-			n.msgRespWorker.RegisterMsgResp(n.nodeManager, n.worker, SubmitResourceMapRes, params)
-		}
-	}
-}

operate/docker.go

@@ -22,14 +22,13 @@ import (
 var httpClient *http.Client
 
 type DockerOp struct {
-	IsHealthy              bool
-	Reason                 string
-	dockerClient           *client.Client
-	UsedExternalPort       map[int64]bool
-	SignApi                map[string]string
-	ModelsInfo             []*models.ModelInfo
-	ModelTaskIdIndexesChan chan []uint64
-	ReportTaskIds          []uint64
+	IsHealthy        bool
+	Reason           string
+	dockerClient     *client.Client
+	UsedExternalPort map[int64]bool
+	SignApi          map[string]string
+	ModelsInfo       []*models.ModelInfo
+	ReportTaskIds    []uint64
 	//RunningImages          map[string]bool
 }
 
@@ -46,14 +45,13 @@ func NewDockerOp() *DockerOp {
 		}
 	}
 	return &DockerOp{
-		IsHealthy:              true,
-		Reason:                 "",
-		dockerClient:           dockerClient,
-		SignApi:                make(map[string]string, 0),
-		ModelsInfo:             make([]*models.ModelInfo, 1000),
-		UsedExternalPort:       make(map[int64]bool, 0),
-		ModelTaskIdIndexesChan: make(chan []uint64, 0),
-		ReportTaskIds:          make([]uint64, 0),
+		IsHealthy:        true,
+		Reason:           "",
+		dockerClient:     dockerClient,
+		SignApi:          make(map[string]string, 0),
+		ModelsInfo:       make([]*models.ModelInfo, 1000),
+		UsedExternalPort: make(map[int64]bool, 0),
+		ReportTaskIds:    make([]uint64, 0),
 		//RunningImages:          make(map[string]bool, 0),
 	}
 }