优化服务的启停顺序

cluster/cluster.go

@@ -26,7 +26,7 @@ type NodeInfo struct {
 	Private           bool
 	ListenAddr        string
 	MaxRpcParamLen    uint32   //最大Rpc参数长度
-	ServiceList       []string //所有的服务列表
+	ServiceList  	  []string //所有的有序服务列表
 	PublicServiceList []string //对外公开的服务列表
 	DiscoveryService  []string //筛选发现的服务，如果不配置，不进行筛选
 	NeighborService   []string
@@ -248,8 +248,9 @@ func (cls *Cluster) checkDynamicDiscovery(localNodeId int) (bool, bool) {
 	return localMaster, hasMaster
 }
 
-func (cls *Cluster) appendService(serviceName string, bPublicService bool) {
+func (cls *Cluster) AddDynamicDiscoveryService(serviceName string, bPublicService bool) {
-	cls.localNodeInfo.ServiceList = append(cls.localNodeInfo.ServiceList, serviceName)
+	addServiceList := append([]string{},serviceName)
+	cls.localNodeInfo.ServiceList = append(addServiceList,cls.localNodeInfo.ServiceList...)
 	if bPublicService {
 		cls.localNodeInfo.PublicServiceList = append(cls.localNodeInfo.PublicServiceList, serviceName)
 	}
@@ -293,11 +294,10 @@ func (cls *Cluster) SetupServiceDiscovery(localNodeId int, setupServiceFun Setup
 
 	//2.如果为动态服务发现安装本地发现服务
 	cls.serviceDiscovery = getDynamicDiscovery()
+	cls.AddDynamicDiscoveryService(DynamicDiscoveryClientName, true)
 	if localMaster == true {
-		cls.appendService(DynamicDiscoveryMasterName, false)
+		cls.AddDynamicDiscoveryService(DynamicDiscoveryMasterName, false)
 	}
-	cls.appendService(DynamicDiscoveryClientName, true)
-
 }
 
 func (cls *Cluster) FindRpcHandler(serviceName string) rpc.IRpcHandler {

node/node.go

@@ -22,7 +22,6 @@ import (
 	"time"
 )
 
-var closeSig chan bool
 var sig chan os.Signal
 var nodeId int
 var preSetupService []service.IService //预安装
@@ -40,8 +39,6 @@ const(
 )
 
 func init() {
-
-	closeSig = make(chan bool, 1)
 	sig = make(chan os.Signal, 3)
 	signal.Notify(sig, syscall.SIGINT, syscall.SIGTERM, syscall.Signal(10))
 
@@ -155,21 +152,23 @@ func initNode(id int) {
 		return
 	}
 
-	//2.setup service
+	//2.顺序安装服务
-	for _, s := range preSetupService {
+	serviceOrder := cluster.GetCluster().GetLocalNodeInfo().ServiceList
-		//是否配置的service
+	for _,serviceName:= range serviceOrder{
-		if cluster.GetCluster().IsConfigService(s.GetName()) == false {
+		for _, s := range preSetupService {
-			continue
+			if s.GetName() != serviceName {
+				continue
+			}
+
+			pServiceCfg := cluster.GetCluster().GetServiceCfg(s.GetName())
+			s.Init(s, cluster.GetRpcClient, cluster.GetRpcServer, pServiceCfg)
+
+			service.Setup(s)
 		}
-
-		pServiceCfg := cluster.GetCluster().GetServiceCfg(s.GetName())
-		s.Init(s, cluster.GetRpcClient, cluster.GetRpcServer, pServiceCfg)
-
-		service.Setup(s)
 	}
 
 	//3.service初始化
-	service.Init(closeSig)
+	service.Init()
 }
 
 func initLog() error {
@@ -274,8 +273,7 @@ func startNode(args interface{}) error {
 	}
 	cluster.GetCluster().Stop()
 	//7.退出
-	close(closeSig)
+	service.StopAllService()
-	service.WaitStop()
 
 	log.SRelease("Server is stop.")
 	return nil

service/service.go

@@ -16,13 +16,11 @@ import (
 	"sync/atomic"
 )
 
-
-var closeSig chan bool
 var timerDispatcherLen = 100000
 
 type IService interface {
 	Init(iService IService,getClientFun rpc.FuncRpcClient,getServerFun rpc.FuncRpcServer,serviceCfg interface{})
-	Wait()
+	Stop()
 	Start()
 
 	OnSetup(iService IService)
@@ -61,6 +59,8 @@ type Service struct {
 	nodeEventLister rpc.INodeListener
 	discoveryServiceLister rpc.IDiscoveryServiceListener
 	chanEvent chan event.IEvent
+
+	closeSig chan bool
 }
 
 // RpcConnEvent Node结点连接事件
@@ -105,6 +105,7 @@ func (s *Service) OpenProfiler()  {
 }
 
 func (s *Service) Init(iService IService,getClientFun rpc.FuncRpcClient,getServerFun rpc.FuncRpcServer,serviceCfg interface{}) {
+	s.closeSig = make(chan bool, 1)
 	s.dispatcher =timer.NewDispatcher(timerDispatcherLen)
 	if s.chanEvent == nil {
 		s.chanEvent = make(chan event.IEvent,maxServiceEventChannel)
@@ -125,26 +126,31 @@ func (s *Service) Init(iService IService,getClientFun rpc.FuncRpcClient,getServe
 	s.eventHandler.Init(s.eventProcessor)
 }
 
-
 func (s *Service) Start() {
 	s.startStatus = true
+	var waitRun sync.WaitGroup
+
 	for i:=int32(0);i< s.goroutineNum;i++{
 		s.wg.Add(1)
+		waitRun.Add(1)
 		go func(){
+			log.SRelease(s.GetName()," service is running",)
+			waitRun.Done()
 			s.Run()
 		}()
 	}
+
+	waitRun.Wait()
 }
 
 func (s *Service) Run() {
-	log.SDebug("Start running Service ", s.GetName())
 	defer s.wg.Done()
 	var bStop = false
 	s.self.(IService).OnStart()
 	for{
 		var analyzer *profiler.Analyzer
 		select {
-		case <- closeSig:
+		case <- s.closeSig:
 			bStop = true
 		case ev := <- s.chanEvent:
 			switch ev.GetEventType() {
@@ -238,8 +244,8 @@ func (s *Service) Release(){
 			log.SError("core dump info[",errString,"]\n",string(buf[:l]))
 		}
 	}()
+	
 	s.self.OnRelease()
-	log.SDebug("Release Service ", s.GetName())
 }
 
 func (s *Service) OnRelease(){
@@ -249,8 +255,11 @@ func (s *Service) OnInit() error {
 	return nil
 }
 
-func (s *Service) Wait(){
+func (s *Service) Stop(){
+	log.SRelease("stop ",s.GetName()," service ")
+	close(s.closeSig)
 	s.wg.Wait()
+	log.SRelease(s.GetName()," service has been stopped")
 }
 
 func (s *Service) GetServiceCfg()interface{}{

service/servicemgr.go

@@ -19,9 +19,7 @@ func init(){
 	setupServiceList = []IService{}
 }
 
-func Init(chanCloseSig chan bool) {
+func Init() {
-	closeSig=chanCloseSig
-
 	for _,s := range setupServiceList {
 		err := s.OnInit()
 		if err != nil {
@@ -57,8 +55,8 @@ func Start(){
 	}
 }
 
-func WaitStop(){
+func StopAllService(){
 	for i := len(setupServiceList) - 1; i >= 0; i-- {
-		setupServiceList[i].Wait()
+		setupServiceList[i].Stop()
 	}
 }