TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-12 23:00:25 +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

11
internal/db/models/node_cluster_dao.go
View File

@@ -792,6 +792,17 @@ func (this *NodeClusterDAO) FindEnabledNodeClustersWithIds(tx *dbs.Tx, clusterId
return
}
// ExistsEnabledCluster 检查集群是否存在
func (this *NodeClusterDAO) ExistsEnabledCluster(tx *dbs.Tx, clusterId int64) (bool, error) {
if clusterId <= 0 {
return false, nil
}
return this.Query(tx).
Pk(clusterId).
State(NodeClusterStateEnabled).
Exist()
}
// NotifyUpdate 通知更新
func (this *NodeClusterDAO) NotifyUpdate(tx *dbs.Tx, clusterId int64) error {
return SharedNodeTaskDAO.CreateClusterTask(tx, nodeconfigs.NodeRoleNode, clusterId, NodeTaskTypeConfigChanged)

16
internal/db/models/node_ip_address_dao.go
View File

@@ -401,6 +401,22 @@ func (this *NodeIPAddressDAO) UpdateAddressIsUp(tx *dbs.Tx, addressId int64, isU
return this.NotifyUpdate(tx, addressId)
}
// UpdateAddressBackupIP 设置备用IP
func (this *NodeIPAddressDAO) UpdateAddressBackupIP(tx *dbs.Tx, addressId int64, thresholdId int64, ip string) error {
if addressId <= 0 {
return errors.New("invalid addressId")
}
var op = NewNodeIPAddressOperator()
op.Id = addressId
op.BackupThresholdId = thresholdId
op.BackupIP = ip
err := this.Save(tx, op)
if err != nil {
return err
}
return this.NotifyUpdate(tx, addressId)
}
// NotifyUpdate 通知更新
func (this *NodeIPAddressDAO) NotifyUpdate(tx *dbs.Tx, addressId int64) error {
address, err := this.Query(tx).

11
internal/db/models/node_ip_address_dao_test.go
View File

@@ -29,3 +29,14 @@ func TestNodeIPAddressDAO_FireThresholds(t *testing.T) {
}
t.Log("ok")
}
func TestNodeIPAddressDAO_LoopTasks(t *testing.T) {
dbs.NotifyReady()
var tx *dbs.Tx
err := SharedNodeIPAddressDAO.loopTask(tx, nodeconfigs.NodeRoleNode)
if err != nil {
t.Fatal(err)
}
t.Log("ok")
}

1
internal/db/models/node_ip_address_log_dao.go
View File

@@ -45,6 +45,7 @@ func (this *NodeIPAddressLogDAO) CreateLog(tx *dbs.Tx, adminId int64, addrId int
op.CanAccess = addr.CanAccess
op.IsOn = addr.IsOn
op.IsUp = addr.IsUp
op.BackupIP = addr.BackupIP
op.Day = timeutil.Format("Ymd")
return this.Save(tx, op)
}

2
internal/db/models/node_ip_address_log_model.go
View File

@@ -11,6 +11,7 @@ type NodeIPAddressLog struct {
IsOn uint8 `field:"isOn"` // 是否启用
CanAccess uint8 `field:"canAccess"` // 是否可访问
Day string `field:"day"` // YYYYMMDD，用来清理
BackupIP string `field:"backupIP"` // 备用IP
}
type NodeIPAddressLogOperator struct {
@@ -23,6 +24,7 @@ type NodeIPAddressLogOperator struct {
IsOn interface{} // 是否启用
CanAccess interface{} // 是否可访问
Day interface{} // YYYYMMDD，用来清理
BackupIP interface{} // 备用IP
}
func NewNodeIPAddressLogOperator() *NodeIPAddressLogOperator {

8
internal/db/models/node_ip_address_model.go
View File

@@ -13,8 +13,10 @@ type NodeIPAddress struct {
CanAccess uint8 `field:"canAccess"` // 是否可以访问
IsOn uint8 `field:"isOn"` // 是否启用
IsUp uint8 `field:"isUp"` // 是否上线
//Thresholds string `field:"thresholds"` // 上线阈值
Thresholds string `field:"thresholds"` // 上线阈值
Connectivity string `field:"connectivity"` // 连通性状态
BackupIP string `field:"backupIP"` // 备用IP
BackupThresholdId uint32 `field:"backupThresholdId"` // 触发备用IP的阈值
}
type NodeIPAddressOperator struct {
@@ -29,8 +31,10 @@ type NodeIPAddressOperator struct {
CanAccess interface{} // 是否可以访问
IsOn interface{} // 是否启用
IsUp interface{} // 是否上线
//Thresholds interface{} // 上线阈值
Thresholds interface{} // 上线阈值
Connectivity interface{} // 连通性状态
BackupIP interface{} // 备用IP
BackupThresholdId interface{} // 触发备用IP的阈值
}
func NewNodeIPAddressOperator() *NodeIPAddressOperator {

26
internal/db/models/node_ip_address_model_ext.go
View File

@@ -6,6 +6,7 @@ import (
"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
)
// DecodeConnectivity 解析联通数值
func (this *NodeIPAddress) DecodeConnectivity() *nodeconfigs.Connectivity {
var connectivity = &nodeconfigs.Connectivity{}
if len(this.Connectivity) > 0 {
@@ -16,3 +17,28 @@ func (this *NodeIPAddress) DecodeConnectivity() *nodeconfigs.Connectivity {
}
return connectivity
}
// DNSIP 获取当前DNS可以使用的IP
func (this *NodeIPAddress) DNSIP() string {
var backupIP = this.DecodeBackupIP()
if len(backupIP) > 0 {
return backupIP
}
return this.Ip
}
// DecodeBackupIP 获取备用IP
func (this *NodeIPAddress) DecodeBackupIP() string {
if this.BackupThresholdId > 0 && len(this.BackupIP) > 0 {
// 阈值是否存在
b, err := SharedNodeIPAddressThresholdDAO.ExistsEnabledThreshold(nil, int64(this.BackupThresholdId))
if err != nil {
remotelogs.Error("NodeIPAddress.DNSIP", "check enabled threshold failed: "+err.Error())
} else {
if b {
return this.BackupIP
}
}
}
return ""
}

8
internal/db/models/node_ip_address_threshold_dao.go
View File

@@ -234,3 +234,11 @@ func (this *NodeIPAddressThresholdDAO) formatThreshold(tx *dbs.Tx, threshold *No
return nil
}
// ExistsEnabledThreshold 检查阈值是否可以使用
func (this *NodeIPAddressThresholdDAO) ExistsEnabledThreshold(tx *dbs.Tx, thresholdId int64) (bool, error) {
return this.Query(tx).
Pk(thresholdId).
State(NodeIPAddressThresholdStateEnabled).
Exist()
}

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()
}

2
internal/tasks/dns_task_executor.go
View File

@@ -311,7 +311,7 @@ func (this *DNSTaskExecutor) doCluster(taskId int64, clusterId int64) error {
continue
}
for _, ipAddress := range ipAddresses {
ip := ipAddress.Ip
ip := ipAddress.DNSIP()
if len(ip) == 0 || ipAddress.CanAccess == 0 || ipAddress.IsUp == 0 || ipAddress.IsOn == 0 {
continue
}