TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-12-29 01:06:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

实现节点自动切换到备用IP

Browse Source
This commit is contained in:
刘祥超
2021-09-13 10:51:05 +08:00
parent 7fcc2b7dba
commit 0b8501a724
14 changed files with 112 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/rpc/services/service_dns_domain.go
View File

@@ -441,7 +441,7 @@ func (this *DNSDomainService) findClusterDNSChanges(cluster *models.NodeCluster,
}
for _, route := range routeCodes {
for _, ipAddress := range ipAddresses {
ip := ipAddress.Ip
ip := ipAddress.DNSIP()
if len(ip) == 0 {
continue
}

2
internal/rpc/services/service_node.go
View File

@@ -1262,7 +1262,7 @@ func (this *NodeService) FindAllEnabledNodesDNSWithNodeClusterId(ctx context.Con
}
for _, ipAddress := range ipAddresses {
ip := ipAddress.Ip
ip := ipAddress.DNSIP()
if len(ip) == 0 {
continue
}

3
internal/rpc/services/service_node_ip_address.go
View File

@@ -130,6 +130,7 @@ func (this *NodeIPAddressService) FindEnabledNodeIPAddress(ctx context.Context,
CanAccess: address.CanAccess == 1,
IsOn: address.IsOn == 1,
IsUp: address.IsUp == 1,
BackupIP: address.DecodeBackupIP(),
}
}
@@ -165,6 +166,7 @@ func (this *NodeIPAddressService) FindAllEnabledIPAddressesWithNodeId(ctx contex
CanAccess: address.CanAccess == 1,
IsOn: address.IsOn == 1,
IsUp: address.IsUp == 1,
BackupIP: address.DecodeBackupIP(),
})
}
@@ -214,6 +216,7 @@ func (this *NodeIPAddressService) ListEnabledIPAddresses(ctx context.Context, re
CanAccess: addr.CanAccess == 1,
IsOn: addr.IsOn == 1,
IsUp: addr.IsUp == 1,
BackupIP: addr.DecodeBackupIP(),
})
}
return &pb.ListEnabledIPAddressesResponse{NodeIPAddresses: pbAddrs}, nil

1
internal/rpc/services/service_node_ip_address_log.go
View File

@@ -81,6 +81,7 @@ func (this *NodeIPAddressLogService) ListNodeIPAddressLogs(ctx context.Context,
IsOn: log.IsOn == 1,
IsUp: log.IsUp == 1,
CanAccess: log.CanAccess == 1,
BackupIP: log.BackupIP,
NodeIPAddress: pbAddr,
Admin: pbAdmin,
})

10
internal/rpc/services/service_node_value.go
View File

@@ -4,7 +4,6 @@ package services
import (
"context"
teaconst "github.com/TeaOSLab/EdgeAPI/internal/const"
"github.com/TeaOSLab/EdgeAPI/internal/db/models"
rpcutils "github.com/TeaOSLab/EdgeAPI/internal/rpc/utils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -46,15 +45,6 @@ func (this *NodeValueService) CreateNodeValue(ctx context.Context, req *pb.Creat
return nil, err
}
// 触发IP阈值
// 企业版专有
if teaconst.IsPlus {
err = models.SharedNodeIPAddressDAO.FireThresholds(tx, role, nodeId)
if err != nil {
return nil, err
}
}
return this.Success()
}