update conn nm failed count

conf/config.go

@@ -26,6 +26,7 @@ type Config struct {
 	ApiUrl              string  `json:"api_url"`
 	ValidatorUrl        string  `json:"validator_url"`
 	OssUrl              string  `json:"oss_url"`
+	AllowConnNmCount    int     `json:"allow_conn_nm_count"`
 }
 
 var _cfg *Config = nil

config.json

@@ -7,5 +7,6 @@
   "container_num": 1,
   "chain_id": 100,
   "validator_url": "43.198.252.255:20011",
-  "oss_url": "http://43.198.252.255:13000/api/v1/upload"
+  "oss_url": "http://43.198.252.255:13000/api/v1/upload",
+  "allow_conn_nm_count": 5
 }
\ No newline at end of file

nm/monitor_seed.go

@@ -11,6 +11,7 @@ import (
 )
 
 func monitorNodeManagerSeed() {
+	connectNmCumulativeCount := 0
 	ticker := time.NewTicker(time.Second * 1)
 	for {
 		select {
@@ -19,22 +20,31 @@ func monitorNodeManagerSeed() {
 			log.Info("Nm seed url:", seed)
 			seedServiceClient := operate.ConnNmGrpc(seed)
 			if seedServiceClient == nil {
+				if connectNmCumulativeCount == conf.GetConfig().AllowConnNmCount {
 					panic("Dial nm seed service client failed")
 				}
+				connectNmCumulativeCount++
+				continue
+			}
 			list, err := seedServiceClient.ManagerList(context.Background(), &nodeManagerV1.ManagerListRequest{}, grpc.EmptyCallOption{})
 			if err != nil {
+				if connectNmCumulativeCount == conf.GetConfig().AllowConnNmCount {
 					panic("Nm seed seed service is dealing")
 				}
+				connectNmCumulativeCount++
+				continue
+			}
 			if list.GetManagers() == nil || len(list.GetManagers()) == 0 {
+				log.Warn("Get managers is empty through Nm seed service")
 				continue
 			}
 			for _, node := range list.GetManagers() {
-				if isExistNodeManager(node.Endpoint) {
+				if isExistNodeManager(node) {
 					continue
 				}
 				nodeManagerArr = append(nodeManagerArr, &NodeManager{Info: node, IsUsed: false, IsExist: true})
 			}
-			isInit = false
+			isInit = true
 			ticker = time.NewTicker(time.Minute * 10)
 		}
 	}

nm/nm_operate.go

@@ -44,9 +44,10 @@ func getUnUsedNodeManagers() []*NodeManager {
 	return res
 }
 
-func isExistNodeManager(endPoint string) bool {
+func isExistNodeManager(nodeManager *nodeManagerV1.NodeManagerInfo) bool {
 	for _, manager := range nodeManagerArr {
-		if endPoint == manager.Info.Endpoint {
+		if nodeManager.Endpoint == manager.Info.Endpoint {
+			manager.Info.Publickey = nodeManager.Publickey
 			return true
 		}
 	}

nm/start.go

@@ -17,7 +17,7 @@ import (
 
 // 指定远程 Docker 服务的地址
 var (
-	isInit                = true
+	isInit                = false
 	nodeManagerArr        []*NodeManager
 	usedNodeManagerClient []*models.NodeManagerClient
 	nodeManagerClientChan chan *models.NodeManagerClient
@@ -44,7 +44,7 @@ func StartMonitor() {
 
 	go monitorModelInfo(dockerOp)
 
-	for isInit {
+	for !isInit {
 	}
 
 	var connectNodeManagerCount int64 = 0

test/task_msg_test.go

@@ -116,9 +116,6 @@ func TestTaskHandler_computeTaskHandler(t1 *testing.T) {
 				LruCache:   tt.fields.lruCache,
 				DockerOp:   tt.fields.DockerOp,
 				TaskMsg:    tt.fields.TaskMsg,
-				TaskRespHeader: tt.fields.TaskRespHeader,
-				TaskRespBody:   tt.fields.TaskRespBody,
-				TaskIsSuccess:  tt.fields.TaskIsSuccess,
 				HttpClient: tt.fields.HttpClient,
 			}
 			tt.fields.wg.Add(1)