删除集群的时候，同时删除对应的域名解析/集群切换二级域名先删除再添加新的域名解析

internal/tasks/dns_task_executor.go

@@ -525,11 +525,13 @@ func (this *DNSTaskExecutor) doClusterRemove(taskId int64, clusterId int64, doma
 	}()
 
 	var tx *dbs.Tx
+
+	dnsInfo, err := models.SharedNodeClusterDAO.FindClusterDNSInfo(tx, clusterId, nil)
+	if err != nil {
+		return err
+	}
+
 	if len(dnsName) == 0 {
-		dnsInfo, err := models.SharedNodeClusterDAO.FindClusterDNSInfo(tx, clusterId, nil)
-		if err != nil {
-			return err
-		}
 		if dnsInfo == nil {
 			isOk = true
 			return nil
@@ -541,6 +543,12 @@ func (this *DNSTaskExecutor) doClusterRemove(taskId int64, clusterId int64, doma
 		}
 	}
 
+	// 再次检查是否正在使用，如果正在使用，则直接返回
+	if dnsInfo != nil && dnsInfo.State == models.NodeClusterStateEnabled /** 尚未被删除 **/ && int64(dnsInfo.DnsDomainId) == domainId && dnsInfo.DnsName == dnsName {
+		isOk = true
+		return nil
+	}
+
 	domain, manager, err := this.findDNSManagerWithDomainId(tx, domainId)
 	if err != nil {
 		return err