TRKJ/EdgeAdmin
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAdmin.git synced 2025-11-05 14:20:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

增加节点同步状态提示和任务列表

Browse Source
This commit is contained in:
刘祥超
2021-01-17 16:47:29 +08:00
parent a79d375f4e
commit f7054c69e9
23 changed files with 557 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
internal/tasks/task_sync_cluster.go
View File

@@ -8,6 +8,7 @@ import (
"github.com/TeaOSLab/EdgeCommon/pkg/messageconfigs"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
_ "github.com/iwind/TeaGo/bootstrap"
"github.com/iwind/TeaGo/lists"
"github.com/iwind/TeaGo/logs"
"time"
)
@@ -48,24 +49,32 @@ func (this *SyncClusterTask) loop() error {
return err
}
ctx := rpcClient.Context(0)
resp, err := rpcClient.NodeClusterRPC().FindAllChangedNodeClusters(ctx, &pb.FindAllChangedNodeClustersRequest{})
tasksResp, err := rpcClient.NodeTaskRPC().FindNotifyingNodeTasks(ctx, &pb.FindNotifyingNodeTasksRequest{Size: 100})
if err != nil {
return err
}
nodeIds := []int64{}
taskIds := []int64{}
for _, task := range tasksResp.NodeTasks {
if !lists.ContainsInt64(nodeIds, task.Node.Id) {
nodeIds = append(nodeIds, task.Node.Id)
}
taskIds = append(taskIds, task.Id)
}
if len(nodeIds) == 0 {
return nil
}
_, err = nodeutils.SendMessageToNodeIds(ctx, nodeIds, messageconfigs.MessageCodeNewNodeTask, &messageconfigs.NewNodeTaskMessage{}, 3)
if err != nil {
return err
}
for _, cluster := range resp.NodeClusters {
_, err := rpcClient.NodeRPC().SyncNodesVersionWithCluster(ctx, &pb.SyncNodesVersionWithClusterRequest{
NodeClusterId: cluster.Id,
})
if err != nil {
return err
}
// 发送通知
_, err = nodeutils.SendMessageToCluster(ctx, cluster.Id, messageconfigs.MessageCodeConfigChanged, &messageconfigs.ConfigChangedMessage{}, 10)
if err != nil {
return err
}
// 设置已通知
_, err = rpcClient.NodeTaskRPC().UpdateNodeTasksNotified(ctx, &pb.UpdateNodeTasksNotifiedRequest{NodeTaskIds: taskIds})
if err != nil {
return err
}
return nil
}