third/APIPark
1
0
Fork 0
mirror of https://github.com/APIParkLab/APIPark.git synced 2026-06-14 20:41:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复动态模块上下线失败的问题

Browse Source
This commit is contained in:
Liujian
2024-08-15 09:53:01 +08:00
parent 469a612e41
commit 5dd04479c2
13 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/dynamic-module/dynamic_module.go
+2 -2
View File
@@ -21,8 +21,8 @@ type IDynamicModuleModule interface {
Render(ctx context.Context, module string) (map[string]interface{}, error)
ModuleDrivers(ctx context.Context, group string) ([]*dynamic_module_dto.ModuleDriver, error)
Online(ctx context.Context, module string, id string, clusterInput *dynamic_module_dto.ClusterInput) error
Offline(ctx context.Context, module string, id string, clusterInput *dynamic_module_dto.ClusterInput) error
Online(ctx context.Context, module string, id string) error
Offline(ctx context.Context, module string, id string) error
//PartitionStatuses(ctx context.Context, module string, keyword string, page int, pageSize int) (map[string]map[string]string, error)
//PartitionStatus(ctx context.Context, module string, id string) (*dynamic_module_dto.OnlineInfo, error)
}
module/dynamic-module/iml.go
+10 -17
View File
@@ -42,7 +42,7 @@ func (i *imlDynamicModule) initGateway(ctx context.Context, clusterId string, cl
return nil
}
func (i *imlDynamicModule) Online(ctx context.Context, module string, id string, clusterInput *dynamic_module_dto.ClusterInput) error {
func (i *imlDynamicModule) Online(ctx context.Context, module string, id string) error {
_, has := driver.Get(module)
if !has {
return fmt.Errorf("模块【%s】不存在", module)
@@ -56,7 +56,7 @@ func (i *imlDynamicModule) Online(ctx context.Context, module string, id string,
if err != nil {
return fmt.Errorf("上线失败，配置不存在")
}
clusters, err := i.clusterService.List(ctx, clusterInput.Clusters...)
clusters, err := i.clusterService.List(ctx)
if err != nil || len(clusters) == 0 {
return fmt.Errorf("上线失败，集群不存在")
}
@@ -102,28 +102,21 @@ func (i *imlDynamicModule) Online(ctx context.Context, module string, id string,
})
}
func (i *imlDynamicModule) Offline(ctx context.Context, module string, id string, clusterInput *dynamic_module_dto.ClusterInput) error {
func (i *imlDynamicModule) Offline(ctx context.Context, module string, id string) error {
_, has := driver.Get(module)
if !has {
return fmt.Errorf("模块【%s】不存在", module)
}
//if len(clusterInput.Clusters) == 0 {
// return fmt.Errorf("下线分区失败，分区为空")
//}
return i.transaction.Transaction(ctx, func(ctx context.Context) error {
id = strings.ToLower(fmt.Sprintf("%s_%s", id, module))
if len(clusterInput.Clusters) == 0 {
clusters, err := i.clusterService.List(ctx)
if err != nil {
return err
}
clusterInput.Clusters = make([]string, 0)
for _, c := range clusters {
clusterInput.Clusters = append(clusterInput.Clusters, c.Uuid)
}
clusters, err := i.clusterService.List(ctx)
if err != nil {
return err
}
for _, clusterId := range clusterInput.Clusters {
clusterIds := utils.SliceToSlice(clusters, func(s *cluster.Cluster) string {
return s.Uuid
})
for _, clusterId := range clusterIds {
err := i.dynamicClient(ctx, clusterId, module, func(dynamicClient gateway.IDynamicClient) error {
return dynamicClient.Offline(ctx, &gateway.DynamicRelease{
BasicItem: &gateway.BasicItem{