diff --git a/agent/internal/services/mq/cache.go b/agent/internal/services/mq/cache.go index 13f6e57..9441b2b 100644 --- a/agent/internal/services/mq/cache.go +++ b/agent/internal/services/mq/cache.go @@ -147,9 +147,9 @@ func (svc *Service) WaitCacheMovePackage(msg *agtmq.WaitCacheMovePackage) (*agtm errMsg = tsk.Error().Error() } - return mq.ReplyOK(agtmq.NewWaitCacheMovePackageResp(true, errMsg, nil)) + return mq.ReplyOK(agtmq.NewWaitCacheMovePackageResp(true, errMsg, mvPkgTask.ResultCacheInfos)) } - return mq.ReplyOK(agtmq.NewWaitCacheMovePackageResp(false, "", mvPkgTask.ResultCacheInfos)) + return mq.ReplyOK(agtmq.NewWaitCacheMovePackageResp(false, "", nil)) } } diff --git a/agent/internal/task/cache_move_package.go b/agent/internal/task/cache_move_package.go index 1be99e3..c7c121b 100644 --- a/agent/internal/task/cache_move_package.go +++ b/agent/internal/task/cache_move_package.go @@ -71,6 +71,7 @@ func (t *CacheMovePackage) do(ctx TaskContext) error { if pkgResp.Redundancy.IsRepInfo() { return t.moveRep(ctx, coorCli, pkgResp.Package) } else { + return fmt.Errorf("not implement yet!") // TODO EC的CacheMove逻辑 } diff --git a/agent/main.go b/agent/main.go index 188c850..f6d4ad5 100644 --- a/agent/main.go +++ b/agent/main.go @@ -69,9 +69,10 @@ func main() { if err != nil { log.Fatalf("new agent server failed, err: %s", err.Error()) } - agtSvr.OnError = func(err error) { + agtSvr.OnError(func(err error) { log.Warnf("agent server err: %s", err.Error()) - } + }) + go serveAgentServer(agtSvr, &wg) go reportStatus(&wg) //网络延迟感知 diff --git a/common/pkgs/mq/agent/server.go b/common/pkgs/mq/agent/server.go index b2e6dd0..8819c17 100644 --- a/common/pkgs/mq/agent/server.go +++ b/common/pkgs/mq/agent/server.go @@ -18,8 +18,6 @@ type Service interface { type Server struct { service Service rabbitSvr mq.RabbitMQServer - - OnError func(err error) } func NewServer(svc Service, id int64, cfg *mymq.Config) (*Server, error) { @@ -51,6 +49,10 @@ func (s *Server) Serve() error { return s.rabbitSvr.Serve() } +func (s *Server) OnError(callback func(error)) { + s.rabbitSvr.OnError = callback +} + var msgDispatcher mq.MessageDispatcher = mq.NewMessageDispatcher() // Register 将Service中的一个接口函数作为指定类型消息的处理函数,同时会注册请求和响应的消息类型 diff --git a/common/pkgs/mq/coordinator/server.go b/common/pkgs/mq/coordinator/server.go index 437a3f9..76b57a7 100644 --- a/common/pkgs/mq/coordinator/server.go +++ b/common/pkgs/mq/coordinator/server.go @@ -27,8 +27,6 @@ type Service interface { type Server struct { service Service rabbitSvr mq.RabbitMQServer - - OnError func(err error) } func NewServer(svc Service, cfg *mymq.Config) (*Server, error) { @@ -59,6 +57,10 @@ func (s *Server) Serve() error { return s.rabbitSvr.Serve() } +func (s *Server) OnError(callback func(error)) { + s.rabbitSvr.OnError = callback +} + var msgDispatcher mq.MessageDispatcher = mq.NewMessageDispatcher() // Register 将Service中的一个接口函数作为指定类型消息的处理函数,同时会注册请求和响应的消息类型 diff --git a/common/pkgs/mq/scanner/event.go b/common/pkgs/mq/scanner/event.go index 09b0ba0..bc1238a 100644 --- a/common/pkgs/mq/scanner/event.go +++ b/common/pkgs/mq/scanner/event.go @@ -29,7 +29,3 @@ func NewPostEvent(event scevt.Event, isEmergency bool, dontMerge bool) *PostEven func (client *Client) PostEvent(msg *PostEvent) error { return mq.Send(Service.PostEvent, client.rabbitCli, msg) } - -func init() { - mq.RegisterUnionType(scevt.EventTypeUnino) -} diff --git a/common/pkgs/mq/scanner/event/agent_check_cache.go b/common/pkgs/mq/scanner/event/agent_check_cache.go index a050647..08b241a 100644 --- a/common/pkgs/mq/scanner/event/agent_check_cache.go +++ b/common/pkgs/mq/scanner/event/agent_check_cache.go @@ -1,5 +1,7 @@ package event +var _ = Register[*AgentCheckCache]() + type AgentCheckCache struct { EventBase NodeID int64 `json:"nodeID"` @@ -12,7 +14,3 @@ func NewAgentCheckCache(nodeID int64, fileHashes []string) *AgentCheckCache { FileHashes: fileHashes, } } - -func init() { - Register[AgentCheckCache]() -} diff --git a/common/pkgs/mq/scanner/event/agent_check_state.go b/common/pkgs/mq/scanner/event/agent_check_state.go index c369735..54b9741 100644 --- a/common/pkgs/mq/scanner/event/agent_check_state.go +++ b/common/pkgs/mq/scanner/event/agent_check_state.go @@ -1,5 +1,7 @@ package event +var _ = Register[*AgentCheckState]() + type AgentCheckState struct { EventBase NodeID int64 `json:"nodeID"` @@ -10,7 +12,3 @@ func NewAgentCheckState(nodeID int64) *AgentCheckState { NodeID: nodeID, } } - -func init() { - Register[AgentCheckState]() -} diff --git a/common/pkgs/mq/scanner/event/agent_check_storage.go b/common/pkgs/mq/scanner/event/agent_check_storage.go index a7fe7e1..3c971f2 100644 --- a/common/pkgs/mq/scanner/event/agent_check_storage.go +++ b/common/pkgs/mq/scanner/event/agent_check_storage.go @@ -1,5 +1,7 @@ package event +var _ = Register[*AgentCheckStorage]() + type AgentCheckStorage struct { EventBase StorageID int64 `json:"storageID"` @@ -12,7 +14,3 @@ func NewAgentCheckStorage(storageID int64, packageIDs []int64) *AgentCheckStorag PackageIDs: packageIDs, } } - -func init() { - Register[AgentCheckStorage]() -} diff --git a/common/pkgs/mq/scanner/event/check_cache.go b/common/pkgs/mq/scanner/event/check_cache.go index ffb9278..3325a0b 100644 --- a/common/pkgs/mq/scanner/event/check_cache.go +++ b/common/pkgs/mq/scanner/event/check_cache.go @@ -1,5 +1,7 @@ package event +var _ = Register[*CheckCache]() + type CheckCache struct { EventBase NodeID int64 `json:"nodeID"` @@ -10,7 +12,3 @@ func NewCheckCache(nodeID int64) *CheckCache { NodeID: nodeID, } } - -func init() { - Register[CheckCache]() -} diff --git a/common/pkgs/mq/scanner/event/check_package.go b/common/pkgs/mq/scanner/event/check_package.go index 842a893..526dda0 100644 --- a/common/pkgs/mq/scanner/event/check_package.go +++ b/common/pkgs/mq/scanner/event/check_package.go @@ -1,5 +1,7 @@ package event +var _ = Register[*CheckPackage]() + type CheckPackage struct { EventBase PackageIDs []int64 `json:"packageIDs"` @@ -10,7 +12,3 @@ func NewCheckPackage(packageIDs []int64) *CheckPackage { PackageIDs: packageIDs, } } - -func init() { - Register[CheckPackage]() -} diff --git a/common/pkgs/mq/scanner/event/check_rep_count.go b/common/pkgs/mq/scanner/event/check_rep_count.go index d393cb1..39f2c74 100644 --- a/common/pkgs/mq/scanner/event/check_rep_count.go +++ b/common/pkgs/mq/scanner/event/check_rep_count.go @@ -1,5 +1,7 @@ package event +var _ = Register[*CheckRepCount]() + type CheckRepCount struct { EventBase FileHashes []string `json:"fileHashes"` @@ -10,7 +12,3 @@ func NewCheckRepCount(fileHashes []string) *CheckRepCount { FileHashes: fileHashes, } } - -func init() { - Register[CheckRepCount]() -} diff --git a/common/pkgs/mq/scanner/event/event.go b/common/pkgs/mq/scanner/event/event.go index 0eafbd7..8fc6578 100644 --- a/common/pkgs/mq/scanner/event/event.go +++ b/common/pkgs/mq/scanner/event/event.go @@ -1,6 +1,7 @@ package event import ( + "gitlink.org.cn/cloudream/common/pkgs/mq" "gitlink.org.cn/cloudream/common/pkgs/types" myreflect "gitlink.org.cn/cloudream/common/utils/reflect" ) @@ -15,6 +16,13 @@ type EventBase struct{} func (e *EventBase) Noop() {} -func Register[T any]() { +// 注:此函数必须以var _ = Register[xxx]()的形式被调用,这样才能保证init中RegisterUnionType时 +// TypeUnion不是空的。(因为包级变量初始化比init函数调用先进行) +func Register[T Event]() any { EventTypeUnino.Add(myreflect.TypeOf[T]()) + return nil +} + +func init() { + mq.RegisterUnionType(EventTypeUnino) } diff --git a/common/pkgs/mq/scanner/server.go b/common/pkgs/mq/scanner/server.go index 73fd65f..8219519 100644 --- a/common/pkgs/mq/scanner/server.go +++ b/common/pkgs/mq/scanner/server.go @@ -12,8 +12,6 @@ type Service interface { type Server struct { service Service rabbitSvr mq.RabbitMQServer - - OnError func(err error) } func NewServer(svc Service, cfg *mymq.Config) (*Server, error) { @@ -45,6 +43,10 @@ func (s *Server) Serve() error { return s.rabbitSvr.Serve() } +func (s *Server) OnError(callback func(error)) { + s.rabbitSvr.OnError = callback +} + var msgDispatcher mq.MessageDispatcher = mq.NewMessageDispatcher() // Register 将Service中的一个接口函数作为指定类型消息的处理函数,同时会注册请求和响应的消息类型 diff --git a/coordinator/main.go b/coordinator/main.go index 7474169..ced3f98 100644 --- a/coordinator/main.go +++ b/coordinator/main.go @@ -40,9 +40,9 @@ func main() { logger.Fatalf("new coordinator server failed, err: %s", err.Error()) } - coorSvr.OnError = func(err error) { + coorSvr.OnError(func(err error) { logger.Warnf("coordinator server err: %s", err.Error()) - } + }) // 启动服务 go serveCoorServer(coorSvr) diff --git a/magefiles/main.go b/magefiles/main.go index bd70eb4..b1fa0db 100644 --- a/magefiles/main.go +++ b/magefiles/main.go @@ -69,8 +69,13 @@ func Scripts() error { scriptsDir := "./common/assets/scripts" info, err := os.Stat(scriptsDir) - if errors.Is(err, os.ErrNotExist) || !info.IsDir() { - return fmt.Errorf("script directory not exists or is not a directory") + if errors.Is(err, os.ErrNotExist) { + fmt.Printf("no scripts.\n") + return nil + } + + if !info.IsDir() { + return fmt.Errorf("scripts is not a directory") } fullDirPath, err := filepath.Abs(filepath.Join(BuildDir, "scripts")) @@ -87,8 +92,13 @@ func Confs() error { confDir := "./common/assets/confs" info, err := os.Stat(confDir) - if errors.Is(err, os.ErrNotExist) || !info.IsDir() { - return fmt.Errorf("conf directory not exists or is not a directory") + if errors.Is(err, os.ErrNotExist) { + fmt.Printf("no confs.\n") + return nil + } + + if !info.IsDir() { + return fmt.Errorf("confs is not a directory") } fullDirPath, err := filepath.Abs(filepath.Join(BuildDir, "confs")) @@ -106,7 +116,7 @@ func Agent() error { OutputName: "agent", OutputDir: "agent", AssetsDir: "assets", - EntryFile:"agent/main.go", + EntryFile: "agent/main.go", }) } @@ -115,7 +125,7 @@ func Client() error { OutputName: "client", OutputDir: "client", AssetsDir: "assets", - EntryFile:"client/main.go", + EntryFile: "client/main.go", }) } @@ -124,7 +134,7 @@ func Coordinator() error { OutputName: "coordinator", OutputDir: "coordinator", AssetsDir: "assets", - EntryFile:"coordinator/main.go", + EntryFile: "coordinator/main.go", }) } @@ -133,6 +143,6 @@ func Scanner() error { OutputName: "scanner", OutputDir: "scanner", AssetsDir: "assets", - EntryFile:"scanner/main.go", + EntryFile: "scanner/main.go", }) } diff --git a/scanner/internal/event/agent_check_cache.go b/scanner/internal/event/agent_check_cache.go index 8500776..a838d50 100644 --- a/scanner/internal/event/agent_check_cache.go +++ b/scanner/internal/event/agent_check_cache.go @@ -170,5 +170,5 @@ func (t *AgentCheckCache) startCheck(execCtx ExecuteContext, isComplete bool, ca } func init() { - RegisterMessageConvertor(func(msg scevt.AgentCheckCache) Event { return NewAgentCheckCache(msg.NodeID, msg.FileHashes) }) + RegisterMessageConvertor(func(msg *scevt.AgentCheckCache) Event { return NewAgentCheckCache(msg.NodeID, msg.FileHashes) }) } diff --git a/scanner/internal/event/agent_check_state.go b/scanner/internal/event/agent_check_state.go index de59a4c..314059f 100644 --- a/scanner/internal/event/agent_check_state.go +++ b/scanner/internal/event/agent_check_state.go @@ -113,5 +113,5 @@ func (t *AgentCheckState) Execute(execCtx ExecuteContext) { } func init() { - RegisterMessageConvertor(func(msg scevt.AgentCheckState) Event { return NewAgentCheckState(msg.NodeID) }) + RegisterMessageConvertor(func(msg *scevt.AgentCheckState) Event { return NewAgentCheckState(msg.NodeID) }) } diff --git a/scanner/internal/event/agent_check_storage.go b/scanner/internal/event/agent_check_storage.go index ada76b9..26670c9 100644 --- a/scanner/internal/event/agent_check_storage.go +++ b/scanner/internal/event/agent_check_storage.go @@ -195,5 +195,5 @@ func (t *AgentCheckStorage) startCheck(execCtx ExecuteContext, stg model.Storage } func init() { - RegisterMessageConvertor(func(msg scevt.AgentCheckStorage) Event { return NewAgentCheckStorage(msg.StorageID, msg.PackageIDs) }) + RegisterMessageConvertor(func(msg *scevt.AgentCheckStorage) Event { return NewAgentCheckStorage(msg.StorageID, msg.PackageIDs) }) } diff --git a/scanner/internal/event/check_cache.go b/scanner/internal/event/check_cache.go index 89dbec5..fd3c594 100644 --- a/scanner/internal/event/check_cache.go +++ b/scanner/internal/event/check_cache.go @@ -80,5 +80,5 @@ func (t *CheckCache) Execute(execCtx ExecuteContext) { } func init() { - RegisterMessageConvertor(func(msg scevt.CheckCache) Event { return NewCheckCache(msg.NodeID) }) + RegisterMessageConvertor(func(msg *scevt.CheckCache) Event { return NewCheckCache(msg.NodeID) }) } diff --git a/scanner/internal/event/check_package.go b/scanner/internal/event/check_package.go index 0a5bc91..8f2c653 100644 --- a/scanner/internal/event/check_package.go +++ b/scanner/internal/event/check_package.go @@ -53,5 +53,5 @@ func (t *CheckPackage) Execute(execCtx ExecuteContext) { } func init() { - RegisterMessageConvertor(func(msg scevt.CheckPackage) Event { return NewCheckPackage(msg.PackageIDs) }) + RegisterMessageConvertor(func(msg *scevt.CheckPackage) Event { return NewCheckPackage(msg.PackageIDs) }) } diff --git a/scanner/internal/event/check_rep_count.go b/scanner/internal/event/check_rep_count.go index 78fb874..72f5f44 100644 --- a/scanner/internal/event/check_rep_count.go +++ b/scanner/internal/event/check_rep_count.go @@ -211,5 +211,5 @@ func chooseDeleteAvaiRepNodes(allNodes []model.Node, curAvaiRepNodes []model.Nod } func init() { - RegisterMessageConvertor(func(msg scevt.CheckRepCount) Event { return NewCheckRepCount(msg.FileHashes) }) + RegisterMessageConvertor(func(msg *scevt.CheckRepCount) Event { return NewCheckRepCount(msg.FileHashes) }) } diff --git a/scanner/internal/event/event.go b/scanner/internal/event/event.go index 27a1aba..2533ade 100644 --- a/scanner/internal/event/event.go +++ b/scanner/internal/event/event.go @@ -36,7 +36,7 @@ var msgDispatcher = typedispatcher.NewTypeDispatcher[Event]() func FromMessage(msg scevt.Event) (Event, error) { event, ok := msgDispatcher.Dispatch(msg) if !ok { - return nil, fmt.Errorf("unknow event message type: %s", reflect.TypeOf(msg).Name()) + return nil, fmt.Errorf("unknow event message type: %s", reflect.TypeOf(msg).String()) } return event, nil diff --git a/scanner/main.go b/scanner/main.go index 173af98..ca659b4 100644 --- a/scanner/main.go +++ b/scanner/main.go @@ -53,9 +53,10 @@ func main() { if err != nil { logger.Fatalf("new agent server failed, err: %s", err.Error()) } - agtSvr.OnError = func(err error) { + agtSvr.OnError(func(err error) { logger.Warnf("agent server err: %s", err.Error()) - } + }) + go serveScannerServer(agtSvr, &wg) tickExecutor := tickevent.NewExecutor(tickevent.ExecuteArgs{