增加DNS同步任务状态显示

internal/db/models/dns/dns_task_dao.go

@@ -0,0 +1,153 @@
+package dns
+
+import (
+	"github.com/TeaOSLab/EdgeAPI/internal/errors"
+	_ "github.com/go-sql-driver/mysql"
+	"github.com/iwind/TeaGo/Tea"
+	"github.com/iwind/TeaGo/dbs"
+	"github.com/iwind/TeaGo/maps"
+	"time"
+)
+
+type DNSTaskType = string
+
+const (
+	DNSTaskTypeClusterChange DNSTaskType = "clusterChange"
+	DNSTaskTypeNodeChange    DNSTaskType = "nodeChange"
+	DNSTaskTypeServerChange  DNSTaskType = "serverChange"
+	DNSTaskTypeDomainChange  DNSTaskType = "domainChange"
+)
+
+type DNSTaskDAO dbs.DAO
+
+func NewDNSTaskDAO() *DNSTaskDAO {
+	return dbs.NewDAO(&DNSTaskDAO{
+		DAOObject: dbs.DAOObject{
+			DB:     Tea.Env,
+			Table:  "edgeDNSTasks",
+			Model:  new(DNSTask),
+			PkName: "id",
+		},
+	}).(*DNSTaskDAO)
+}
+
+var SharedDNSTaskDAO *DNSTaskDAO
+
+func init() {
+	dbs.OnReady(func() {
+		SharedDNSTaskDAO = NewDNSTaskDAO()
+	})
+}
+
+// 生成任务
+func (this *DNSTaskDAO) CreateDNSTask(tx *dbs.Tx, clusterId int64, serverId int64, nodeId int64, domainId int64, taskType string) error {
+	if clusterId <= 0 && serverId <= 0 && nodeId <= 0 {
+		return nil
+	}
+	err := this.Query(tx).InsertOrUpdateQuickly(maps.Map{
+		"clusterId": clusterId,
+		"serverId":  serverId,
+		"nodeId":    nodeId,
+		"domainId":  domainId,
+		"updatedAt": time.Now().Unix(),
+		"type":      taskType,
+		"isDone":    false,
+		"isOk":      false,
+		"error":     "",
+	}, maps.Map{
+		"updatedAt": time.Now().Unix(),
+		"isDone":    false,
+		"isOk":      false,
+		"error":     "",
+	})
+	return err
+}
+
+// 生成集群任务
+func (this *DNSTaskDAO) CreateClusterTask(tx *dbs.Tx, clusterId int64, taskType DNSTaskType) error {
+	return this.CreateDNSTask(tx, clusterId, 0, 0, 0, taskType)
+}
+
+// 生成节点任务
+func (this *DNSTaskDAO) CreateNodeTask(tx *dbs.Tx, nodeId int64, taskType DNSTaskType) error {
+	return this.CreateDNSTask(tx, 0, 0, nodeId, 0, taskType)
+}
+
+// 生成服务任务
+func (this *DNSTaskDAO) CreateServerTask(tx *dbs.Tx, serverId int64, taskType DNSTaskType) error {
+	return this.CreateDNSTask(tx, 0, serverId, 0, 0, taskType)
+}
+
+// 生成域名更新任务
+func (this *DNSTaskDAO) CreateDomainTask(tx *dbs.Tx, domainId int64, taskType DNSTaskType) error {
+	return this.CreateDNSTask(tx, 0, 0, 0, domainId, taskType)
+}
+
+// 查找所有正在执行的任务
+func (this *DNSTaskDAO) FindAllDoingTasks(tx *dbs.Tx) (result []*DNSTask, err error) {
+	_, err = this.Query(tx).
+		Attr("isDone", 0).
+		AscPk().
+		Slice(&result).
+		FindAll()
+	return
+}
+
+// 查找正在执行的和错误的任务
+func (this *DNSTaskDAO) FindAllDoingOrErrorTasks(tx *dbs.Tx) (result []*DNSTask, err error) {
+	_, err = this.Query(tx).
+		Where("(isDone=0 OR (isDone=1 AND isOk=0))").
+		AscPk().
+		Slice(&result).
+		FindAll()
+	return
+}
+
+// 检查是否有正在执行的任务
+func (this *DNSTaskDAO) ExistDoingTasks(tx *dbs.Tx) (bool, error) {
+	return this.Query(tx).
+		Attr("isDone", 0).
+		Exist()
+}
+
+// 检查是否有错误的任务
+func (this *DNSTaskDAO) ExistErrorTasks(tx *dbs.Tx) (bool, error) {
+	return this.Query(tx).
+		Attr("isDone", 1).
+		Attr("isOk", 0).
+		Exist()
+}
+
+// 删除任务
+func (this *DNSTaskDAO) DeleteDNSTask(tx *dbs.Tx, taskId int64) error {
+	_, err := this.Query(tx).
+		Pk(taskId).
+		Delete()
+	return err
+}
+
+// 设置任务错误
+func (this *DNSTaskDAO) UpdateDNSTaskError(tx *dbs.Tx, taskId int64, err string) error {
+	if taskId <= 0 {
+		return errors.New("invalid taskId")
+	}
+	op := NewDNSTaskOperator()
+	op.Id = taskId
+	op.IsDone = true
+	op.Error = err
+	op.IsOk = false
+	return this.Save(tx, op)
+}
+
+// 设置任务完成
+func (this *DNSTaskDAO) UpdateDNSTaskDone(tx *dbs.Tx, taskId int64) error {
+	if taskId <= 0 {
+		return errors.New("invalid taskId")
+	}
+	op := NewDNSTaskOperator()
+	op.Id = taskId
+	op.IsDone = true
+	op.IsOk = true
+	op.Error = ""
+	return this.Save(tx, op)
+}

internal/db/models/dns/dns_task_dao_test.go

@@ -0,0 +1,17 @@
+package dns
+
+import (
+	_ "github.com/go-sql-driver/mysql"
+	_ "github.com/iwind/TeaGo/bootstrap"
+	"github.com/iwind/TeaGo/dbs"
+	"testing"
+)
+
+func TestDNSTaskDAO_CreateDNSTask(t *testing.T) {
+	dbs.NotifyReady()
+	err := SharedDNSTaskDAO.CreateDNSTask(nil, 1, 2, 3, "taskType")
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("ok")
+}

internal/db/models/dns/dns_task_model.go

@@ -0,0 +1,32 @@
+package dns
+
+// DNS更新任务
+type DNSTask struct {
+	Id        uint64 `field:"id"`        // ID
+	ClusterId uint32 `field:"clusterId"` // 集群ID
+	ServerId  uint32 `field:"serverId"`  // 服务ID
+	NodeId    uint32 `field:"nodeId"`    // 节点ID
+	DomainId  uint32 `field:"domainId"`  // 域名ID
+	Type      string `field:"type"`      // 任务类型
+	UpdatedAt uint64 `field:"updatedAt"` // 更新时间
+	IsDone    uint8  `field:"isDone"`    // 是否已完成
+	IsOk      uint8  `field:"isOk"`      // 是否成功
+	Error     string `field:"error"`     // 错误信息
+}
+
+type DNSTaskOperator struct {
+	Id        interface{} // ID
+	ClusterId interface{} // 集群ID
+	ServerId  interface{} // 服务ID
+	NodeId    interface{} // 节点ID
+	DomainId  interface{} // 域名ID
+	Type      interface{} // 任务类型
+	UpdatedAt interface{} // 更新时间
+	IsDone    interface{} // 是否已完成
+	IsOk      interface{} // 是否成功
+	Error     interface{} // 错误信息
+}
+
+func NewDNSTaskOperator() *DNSTaskOperator {
+	return &DNSTaskOperator{}
+}

internal/db/models/dns/dns_task_model_ext.go

@@ -0,0 +1 @@
+package dns

internal/db/models/node_cluster_dao.go

@@ -120,7 +120,7 @@ func (this *NodeClusterDAO) FindAllEnableClusterIds(tx *dbs.Tx) (result []int64,
 
 // 创建集群
 func (this *NodeClusterDAO) CreateCluster(tx *dbs.Tx, adminId int64, name string, grantId int64, installDir string, dnsDomainId int64, dnsName string, cachePolicyId int64, httpFirewallPolicyId int64, systemServices map[string]maps.Map) (clusterId int64, err error) {
-	uniqueId, err := this.genUniqueId(tx)
+	uniqueId, err := this.GenUniqueId(tx)
 	if err != nil {
 		return 0, err
 	}
@@ -454,7 +454,11 @@ func (this *NodeClusterDAO) UpdateClusterDNS(tx *dbs.Tx, clusterId int64, dnsNam
 	if err != nil {
 		return err
 	}
-	return this.NotifyUpdate(tx, clusterId)
+	err = this.NotifyUpdate(tx, clusterId)
+	if err != nil {
+		return err
+	}
+	return this.NotifyDNSUpdate(tx, clusterId)
 }
 
 // 检查集群的DNS问题
@@ -545,7 +549,7 @@ func (this *NodeClusterDAO) CheckClusterDNS(tx *dbs.Tx, cluster *NodeCluster) (i
 		}
 
 		// 检查IP地址
-		ipAddr, err := SharedNodeIPAddressDAO.FindFirstNodeIPAddress(tx, nodeId)
+		ipAddr, err := SharedNodeIPAddressDAO.FindFirstNodeAccessIPAddress(tx, nodeId)
 		if err != nil {
 			return nil, err
 		}
@@ -801,7 +805,7 @@ func (this *NodeClusterDAO) FindNodeClusterSystemServices(tx *dbs.Tx, clusterId
 }
 
 // 生成唯一ID
-func (this *NodeClusterDAO) genUniqueId(tx *dbs.Tx) (string, error) {
+func (this *NodeClusterDAO) GenUniqueId(tx *dbs.Tx) (string, error) {
 	for {
 		uniqueId := rands.HexString(32)
 		ok, err := this.Query(tx).
@@ -821,3 +825,13 @@ func (this *NodeClusterDAO) genUniqueId(tx *dbs.Tx) (string, error) {
 func (this *NodeClusterDAO) NotifyUpdate(tx *dbs.Tx, clusterId int64) error {
 	return SharedNodeTaskDAO.CreateClusterTask(tx, clusterId, NodeTaskTypeConfigChanged)
 }
+
+// 通知DNS更新
+// TODO 更新新的DNS解析记录的同时，需要删除老的DNS解析记录
+func (this *NodeClusterDAO) NotifyDNSUpdate(tx *dbs.Tx, clusterId int64) error {
+	err := dns.SharedDNSTaskDAO.CreateClusterTask(tx, clusterId, dns.DNSTaskTypeClusterChange)
+	if err != nil {
+		return err
+	}
+	return nil
+}

internal/db/models/node_dao.go

@@ -2,6 +2,7 @@ package models
 
 import (
 	"encoding/json"
+	"github.com/TeaOSLab/EdgeAPI/internal/db/models/dns"
 	"github.com/TeaOSLab/EdgeAPI/internal/errors"
 	"github.com/TeaOSLab/EdgeAPI/internal/utils"
 	"github.com/TeaOSLab/EdgeAPI/internal/utils/numberutils"
@@ -12,7 +13,6 @@ import (
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/iwind/TeaGo/Tea"
 	"github.com/iwind/TeaGo/dbs"
-	"github.com/iwind/TeaGo/logs"
 	"github.com/iwind/TeaGo/maps"
 	"github.com/iwind/TeaGo/rands"
 	"github.com/iwind/TeaGo/types"
@@ -80,7 +80,17 @@ func (this *NodeDAO) DisableNode(tx *dbs.Tx, nodeId int64) (err error) {
 		return err
 	}
 
-	return this.NotifyUpdate(tx, nodeId)
+	err = this.NotifyUpdate(tx, nodeId)
+	if err != nil {
+		return err
+	}
+
+	err = this.NotifyDNSUpdate(tx, nodeId)
+	if err != nil {
+		return err
+	}
+
+	return nil
 }
 
 // 查找启用中的条目
@@ -106,7 +116,7 @@ func (this *NodeDAO) FindNodeName(tx *dbs.Tx, id int64) (string, error) {
 
 // 创建节点
 func (this *NodeDAO) CreateNode(tx *dbs.Tx, adminId int64, name string, clusterId int64, groupId int64, regionId int64) (nodeId int64, err error) {
-	uniqueId, err := this.genUniqueId(tx)
+	uniqueId, err := this.GenUniqueId(tx)
 	if err != nil {
 		return 0, err
 	}
@@ -134,7 +144,20 @@ func (this *NodeDAO) CreateNode(tx *dbs.Tx, adminId int64, name string, clusterI
 		return 0, err
 	}
 
-	return types.Int64(op.Id), nil
+	// 通知节点更新
+	nodeId = types.Int64(op.Id)
+	err = this.NotifyUpdate(tx, nodeId)
+	if err != nil {
+		return 0, err
+	}
+
+	// 通知DNS更新
+	err = this.NotifyDNSUpdate(tx, nodeId)
+	if err != nil {
+		return 0, err
+	}
+
+	return nodeId, nil
 }
 
 // 修改节点
@@ -156,7 +179,12 @@ func (this *NodeDAO) UpdateNode(tx *dbs.Tx, nodeId int64, name string, clusterId
 		return err
 	}
 
-	return this.NotifyUpdate(tx, nodeId)
+	err = this.NotifyUpdate(tx, nodeId)
+	if err != nil {
+		return err
+	}
+
+	return this.NotifyDNSUpdate(tx, nodeId)
 }
 
 // 计算所有节点数量
@@ -670,7 +698,6 @@ func (this *NodeDAO) FindAllLowerVersionNodesWithClusterId(tx *dbs.Tx, clusterId
 		DescPk().
 		Slice(&result).
 		FindAll()
-	logs.Println(len(result), version) // TODO
 	return
 }
 
@@ -730,6 +757,18 @@ func (this *NodeDAO) FindEnabledNodeDNS(tx *dbs.Tx, nodeId int64) (*Node, error)
 	return one.(*Node), nil
 }
 
+// 获取单个节点的DNS信息，无论什么状态
+func (this *NodeDAO) FindStatelessNodeDNS(tx *dbs.Tx, nodeId int64) (*Node, error) {
+	one, err := this.Query(tx).
+		Pk(nodeId).
+		Result("id", "name", "dnsRoutes", "clusterId", "isOn", "state").
+		Find()
+	if err != nil || one == nil {
+		return nil, err
+	}
+	return one.(*Node), nil
+}
+
 // 修改节点的DNS信息
 func (this *NodeDAO) UpdateNodeDNS(tx *dbs.Tx, nodeId int64, routes map[int64][]string) error {
 	if nodeId <= 0 {
@@ -750,7 +789,17 @@ func (this *NodeDAO) UpdateNodeDNS(tx *dbs.Tx, nodeId int64, routes map[int64][]
 		return err
 	}
 
-	return this.NotifyUpdate(tx, nodeId)
+	err = this.NotifyUpdate(tx, nodeId)
+	if err != nil {
+		return err
+	}
+
+	err = this.NotifyDNSUpdate(tx, nodeId)
+	if err != nil {
+		return err
+	}
+
+	return nil
 }
 
 // 计算节点上线|下线状态
@@ -806,6 +855,11 @@ func (this *NodeDAO) UpdateNodeUp(tx *dbs.Tx, nodeId int64, isUp bool, maxUp int
 		return false, err
 	}
 
+	err = this.NotifyDNSUpdate(tx, nodeId)
+	if err != nil {
+		return false, err
+	}
+
 	return
 }
 
@@ -842,7 +896,7 @@ func (this *NodeDAO) FindNodeVersion(tx *dbs.Tx, nodeId int64) (int64, error) {
 }
 
 // 生成唯一ID
-func (this *NodeDAO) genUniqueId(tx *dbs.Tx) (string, error) {
+func (this *NodeDAO) GenUniqueId(tx *dbs.Tx) (string, error) {
 	for {
 		uniqueId := rands.HexString(32)
 		ok, err := this.Query(tx).
@@ -888,3 +942,28 @@ func (this *NodeDAO) NotifyUpdate(tx *dbs.Tx, nodeId int64) error {
 	}
 	return nil
 }
+
+// 通知DNS更新
+func (this *NodeDAO) NotifyDNSUpdate(tx *dbs.Tx, nodeId int64) error {
+	clusterId, err := this.Query(tx).
+		Pk(nodeId).
+		Result("clusterId").
+		FindInt64Col(0) // 这里不需要加服务状态条件，因为我们即使删除也要删除对应的服务的DNS解析
+	if err != nil {
+		return err
+	}
+	if clusterId <= 0 {
+		return nil
+	}
+	dnsInfo, err := SharedNodeClusterDAO.FindClusterDNSInfo(tx, clusterId)
+	if err != nil {
+		return err
+	}
+	if dnsInfo == nil {
+		return nil
+	}
+	if len(dnsInfo.DnsName) == 0 || dnsInfo.DnsDomainId <= 0 {
+		return nil
+	}
+	return dns.SharedDNSTaskDAO.CreateNodeTask(tx, nodeId, dns.DNSTaskTypeNodeChange)
+}

internal/db/models/node_ip_address_dao.go

@@ -96,6 +96,12 @@ func (this *NodeIPAddressDAO) CreateAddress(tx *dbs.Tx, nodeId int64, name strin
 	if err != nil {
 		return 0, err
 	}
+
+	err = SharedNodeDAO.NotifyDNSUpdate(tx, nodeId)
+	if err != nil {
+		return 0, err
+	}
+
 	return types.Int64(op.Id), nil
 }
 
@@ -134,7 +140,15 @@ func (this *NodeIPAddressDAO) UpdateAddressNodeId(tx *dbs.Tx, addressId int64, n
 		Set("nodeId", nodeId).
 		Set("state", NodeIPAddressStateEnabled). // 恢复状态
 		Update()
-	return err
+	if err != nil {
+		return err
+	}
+
+	err = SharedNodeDAO.NotifyDNSUpdate(tx, nodeId)
+	if err != nil {
+		return err
+	}
+	return nil
 }
 
 // 查找节点的所有的IP地址
@@ -150,7 +164,7 @@ func (this *NodeIPAddressDAO) FindAllEnabledAddressesWithNode(tx *dbs.Tx, nodeId
 }
 
 // 查找节点的第一个可访问的IP地址
-func (this *NodeIPAddressDAO) FindFirstNodeIPAddress(tx *dbs.Tx, nodeId int64) (string, error) {
+func (this *NodeIPAddressDAO) FindFirstNodeAccessIPAddress(tx *dbs.Tx, nodeId int64) (string, error) {
 	return this.Query(tx).
 		Attr("nodeId", nodeId).
 		State(NodeIPAddressStateEnabled).
@@ -162,7 +176,7 @@ func (this *NodeIPAddressDAO) FindFirstNodeIPAddress(tx *dbs.Tx, nodeId int64) (
 }
 
 // 查找节点的第一个可访问的IP地址ID
-func (this *NodeIPAddressDAO) FindFirstNodeIPAddressId(tx *dbs.Tx, nodeId int64) (int64, error) {
+func (this *NodeIPAddressDAO) FindFirstNodeAccessIPAddressId(tx *dbs.Tx, nodeId int64) (int64, error) {
 	return this.Query(tx).
 		Attr("nodeId", nodeId).
 		State(NodeIPAddressStateEnabled).
@@ -172,3 +186,16 @@ func (this *NodeIPAddressDAO) FindFirstNodeIPAddressId(tx *dbs.Tx, nodeId int64)
 		Result("id").
 		FindInt64Col(0)
 }
+
+// 查找节点所有的可访问的IP地址
+func (this *NodeIPAddressDAO) FindNodeAccessIPAddresses(tx *dbs.Tx, nodeId int64) (result []*NodeIPAddress, err error) {
+	_, err = this.Query(tx).
+		Attr("nodeId", nodeId).
+		State(NodeIPAddressStateEnabled).
+		Attr("canAccess", true).
+		Desc("order").
+		AscPk().
+		Slice(&result).
+		FindAll()
+	return
+}

internal/db/models/server_dao.go

@@ -65,15 +65,24 @@ func (this *ServerDAO) EnableServer(tx *dbs.Tx, id uint32) (rowsAffected int64,
 }
 
 // 禁用条目
-func (this *ServerDAO) DisableServer(tx *dbs.Tx, id int64) (err error) {
+func (this *ServerDAO) DisableServer(tx *dbs.Tx, serverId int64) (err error) {
 	_, err = this.Query(tx).
-		Pk(id).
+		Pk(serverId).
 		Set("state", ServerStateDisabled).
 		Update()
 	if err != nil {
 		return err
 	}
-	return this.NotifyUpdate(tx, id)
+	err = this.NotifyUpdate(tx, serverId)
+	if err != nil {
+		return err
+	}
+
+	err = this.NotifyDNSUpdate(tx, serverId)
+	if err != nil {
+		return err
+	}
+	return nil
 }
 
 // 查找启用中的服务
@@ -88,6 +97,15 @@ func (this *ServerDAO) FindEnabledServer(tx *dbs.Tx, serverId int64) (*Server, e
 	return result.(*Server), err
 }
 
+// 查找服务名称
+func (this *ServerDAO) FindEnabledServerName(tx *dbs.Tx, serverId int64) (string, error) {
+	return this.Query(tx).
+		Pk(serverId).
+		State(ServerStateEnabled).
+		Result("name").
+		FindStringCol("")
+}
+
 // 查找服务基本信息
 func (this *ServerDAO) FindEnabledServerBasic(tx *dbs.Tx, serverId int64) (*Server, error) {
 	result, err := this.Query(tx).
@@ -186,7 +204,7 @@ func (this *ServerDAO) CreateServer(tx *dbs.Tx,
 		op.GroupIds = groupIdsJSON
 	}
 
-	dnsName, err := this.genDNSName(tx)
+	dnsName, err := this.GenDNSName(tx)
 	if err != nil {
 		return 0, err
 	}
@@ -203,11 +221,18 @@ func (this *ServerDAO) CreateServer(tx *dbs.Tx,
 
 	serverId = types.Int64(op.Id)
 
+	// 通知配置更改
 	err = this.NotifyUpdate(tx, serverId)
 	if err != nil {
 		return 0, err
 	}
 
+	// 通知DNS更改
+	err = this.NotifyDNSUpdate(tx, serverId)
+	if err != nil {
+		return 0, err
+	}
+
 	return serverId, nil
 }
 
@@ -244,7 +269,8 @@ func (this *ServerDAO) UpdateServerBasic(tx *dbs.Tx, serverId int64, name string
 		return err
 	}
 
-	return nil
+	// 因为可能有isOn的原因，所以需要修改
+	return this.NotifyDNSUpdate(tx, serverId)
 }
 
 // 设置用户相关的基本信息
@@ -487,7 +513,7 @@ func (this *ServerDAO) InitServerWeb(tx *dbs.Tx, serverId int64) (int64, error)
 }
 
 // 查找ServerNames配置
-func (this *ServerDAO) FindServerNames(tx *dbs.Tx, serverId int64) (serverNamesJSON []byte, isAuditing bool, auditingServerNamesJSON []byte, auditingResultJSON []byte, err error) {
+func (this *ServerDAO) FindServerServerNames(tx *dbs.Tx, serverId int64) (serverNamesJSON []byte, isAuditing bool, auditingServerNamesJSON []byte, auditingResultJSON []byte, err error) {
 	if serverId <= 0 {
 		return
 	}
@@ -574,7 +600,12 @@ func (this *ServerDAO) UpdateServerAuditing(tx *dbs.Tx, serverId int64, result *
 		return err
 	}
 
-	return this.NotifyUpdate(tx, serverId)
+	err = this.NotifyUpdate(tx, serverId)
+	if err != nil {
+		return err
+	}
+
+	return this.NotifyDNSUpdate(tx, serverId)
 }
 
 // 修改反向代理配置
@@ -1085,7 +1116,7 @@ func (this *ServerDAO) GenerateServerDNSName(tx *dbs.Tx, serverId int64) (string
 	if serverId <= 0 {
 		return "", errors.New("invalid serverId")
 	}
-	dnsName, err := this.genDNSName(tx)
+	dnsName, err := this.GenDNSName(tx)
 	if err != nil {
 		return "", err
 	}
@@ -1102,6 +1133,11 @@ func (this *ServerDAO) GenerateServerDNSName(tx *dbs.Tx, serverId int64) (string
 		return "", err
 	}
 
+	err = this.NotifyDNSUpdate(tx, serverId)
+	if err != nil {
+		return "", err
+	}
+
 	return dnsName, nil
 }
 
@@ -1121,6 +1157,18 @@ func (this *ServerDAO) FindServerDNSName(tx *dbs.Tx, serverId int64) (string, er
 		FindStringCol("")
 }
 
+// 查询服务的DNS相关信息，并且不关注状态
+func (this *ServerDAO) FindStatelessServerDNS(tx *dbs.Tx, serverId int64) (*Server, error) {
+	one, err := this.Query(tx).
+		Pk(serverId).
+		Result("id", "dnsName", "isOn", "state", "clusterId").
+		Find()
+	if err != nil || one == nil {
+		return nil, err
+	}
+	return one.(*Server), nil
+}
+
 // 获取当前服务的管理员ID和用户ID
 func (this *ServerDAO) FindServerAdminIdAndUserId(tx *dbs.Tx, serverId int64) (adminId int64, userId int64, err error) {
 	one, err := this.Query(tx).
@@ -1271,6 +1319,22 @@ func (this *ServerDAO) CheckPortIsUsing(tx *dbs.Tx, clusterId int64, port int, e
 		Exist()
 }
 
+// 生成DNS Name
+func (this *ServerDAO) GenDNSName(tx *dbs.Tx) (string, error) {
+	for {
+		dnsName := rands.HexString(8)
+		exist, err := this.Query(tx).
+			Attr("dnsName", dnsName).
+			Exist()
+		if err != nil {
+			return "", err
+		}
+		if !exist {
+			return dnsName, nil
+		}
+	}
+}
+
 // 同步集群
 func (this *ServerDAO) NotifyUpdate(tx *dbs.Tx, serverId int64) error {
 	// 更新配置
@@ -1290,18 +1354,27 @@ func (this *ServerDAO) NotifyUpdate(tx *dbs.Tx, serverId int64) error {
 	return SharedNodeTaskDAO.CreateClusterTask(tx, clusterId, NodeTaskTypeConfigChanged)
 }
 
-// 生成DNS Name
-func (this *ServerDAO) genDNSName(tx *dbs.Tx) (string, error) {
-	for {
-		dnsName := rands.HexString(8)
-		exist, err := this.Query(tx).
-			Attr("dnsName", dnsName).
-			Exist()
-		if err != nil {
-			return "", err
-		}
-		if !exist {
-			return dnsName, nil
-		}
+// 通知DNS更新
+func (this *ServerDAO) NotifyDNSUpdate(tx *dbs.Tx, serverId int64) error {
+	clusterId, err := this.Query(tx).
+		Pk(serverId).
+		Result("clusterId").
+		FindInt64Col(0) // 这里不需要加服务状态条件，因为我们即使删除也要删除对应的服务的DNS解析
+	if err != nil {
+		return err
 	}
+	if clusterId <= 0 {
+		return nil
+	}
+	dnsInfo, err := SharedNodeClusterDAO.FindClusterDNSInfo(tx, clusterId)
+	if err != nil {
+		return err
+	}
+	if dnsInfo == nil {
+		return nil
+	}
+	if len(dnsInfo.DnsName) == 0 || dnsInfo.DnsDomainId <= 0 {
+		return nil
+	}
+	return dns.SharedDNSTaskDAO.CreateServerTask(tx, serverId, dns.DNSTaskTypeServerChange)
 }