From f3ff09b90f2c843a41d65e623077a7a69142f4e1 Mon Sep 17 00:00:00 2001
From: duanhf2012 <6549168@qq.com>
Date: Fri, 17 Mar 2023 12:09:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96rpc=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=97=A5=E5=BF=97=20=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=9A=84=E6=9C=8D=E5=8A=A1=E5=BF=85=E9=9C=80?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85=20=E4=BC=98=E5=8C=96=E7=BB=93=E7=82=B9?=
 =?UTF-8?q?=E6=96=AD=E5=BC=80=E8=BF=9E=E6=8E=A5=E6=97=B6=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=BB=93=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cluster/dynamicdiscovery.go | 17 +++++++++++++++++
 node/node.go                |  7 ++++++-
 rpc/rpchandler.go           |  6 +++++-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/cluster/dynamicdiscovery.go b/cluster/dynamicdiscovery.go
index e797610..7db631a 100644
--- a/cluster/dynamicdiscovery.go
+++ b/cluster/dynamicdiscovery.go
@@ -60,6 +60,21 @@ func (ds *DynamicDiscoveryMaster) addNodeInfo(nodeInfo *rpc.NodeInfo) {
 	ds.nodeInfo = append(ds.nodeInfo, nodeInfo)
 }
 
+func (ds *DynamicDiscoveryMaster) removeNodeInfo(nodeId int32) {
+	if _,ok:= ds.mapNodeInfo[nodeId];ok == false {
+		return
+	}
+
+	for i:=0;i<len(ds.nodeInfo);i++ {
+		if ds.nodeInfo[i].NodeId == nodeId {
+			ds.nodeInfo = append(ds.nodeInfo[:i],ds.nodeInfo[i+1:]...)
+			break
+		}
+	}
+
+	delete(ds.mapNodeInfo,nodeId)
+}
+
 func (ds *DynamicDiscoveryMaster) OnInit() error {
 	ds.mapNodeInfo = make(map[int32]struct{}, 20)
 	ds.RegRpcListener(ds)
@@ -103,6 +118,8 @@ func (ds *DynamicDiscoveryMaster) OnNodeDisconnect(nodeId int) {
 		return
 	}
 
+	ds.removeNodeInfo(int32(nodeId))
+
 	var notifyDiscover rpc.SubscribeDiscoverNotify
 	notifyDiscover.MasterNodeId = int32(cluster.GetLocalNodeInfo().NodeId)
 	notifyDiscover.DelNodeId = int32(nodeId)
diff --git a/node/node.go b/node/node.go
index cabc933..e347d4c 100644
--- a/node/node.go
+++ b/node/node.go
@@ -155,16 +155,21 @@ func initNode(id int) {
 	//2.顺序安装服务
 	serviceOrder := cluster.GetCluster().GetLocalNodeInfo().ServiceList
 	for _,serviceName:= range serviceOrder{
+		bSetup := false
 		for _, s := range preSetupService {
 			if s.GetName() != serviceName {
 				continue
 			}
-
+			bSetup = true
 			pServiceCfg := cluster.GetCluster().GetServiceCfg(s.GetName())
 			s.Init(s, cluster.GetRpcClient, cluster.GetRpcServer, pServiceCfg)
 
 			service.Setup(s)
 		}
+
+		if bSetup == false {
+			log.SFatal("Service name "+serviceName+" configuration error")
+		}
 	}
 
 	//3.service初始化
diff --git a/rpc/rpchandler.go b/rpc/rpchandler.go
index 2aefb76..cf61d66 100644
--- a/rpc/rpchandler.go
+++ b/rpc/rpchandler.go
@@ -496,7 +496,11 @@ func (handler *RpcHandler) asyncCallRpc(nodeId int, serviceMethod string, args i
 	err, count := handler.funcRpcClient(nodeId, serviceMethod, pClientList[:])
 	if count == 0 || err != nil {
 		if err == nil {
-			err = fmt.Errorf("cannot find %s from nodeId %d",serviceMethod,nodeId)
+			if nodeId  > 0 {
+				err = fmt.Errorf("cannot find %s from nodeId %d",serviceMethod,nodeId)
+			}else {
+				err = fmt.Errorf("No %s service found in the origin network",serviceMethod)
+			}
 		}
 		fVal.Call([]reflect.Value{reflect.ValueOf(reply), reflect.ValueOf(err)})
 		log.SError("Call serviceMethod is error:", err.Error())