Skip to content

Commit 06e6184

Browse files
committed
feat(backend): optimize dbha's alert info close #13269
1 parent 9e68be3 commit 06e6184

File tree

6 files changed

+21
-6
lines changed

6 files changed

+21
-6
lines changed

dbm-services/common/dbha/ha-module/agent/monitor_agent.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,8 @@ func (a *MonitorAgent) RefreshGMCache() {
216216
}
217217

218218
// delete not exists or expired ip from gm cache
219-
log.Logger.Debugf("try to refresh gm cache instances, cache number:%d", len(a.ReportGMCache))
219+
log.Logger.Debugf("[%s] try to refresh gm cache instances, cache number:%d",
220+
a.DetectType, len(a.ReportGMCache))
220221
now := time.Now()
221222
for ip, cacheIns := range a.ReportGMCache {
222223
if now.After(cacheIns.ReporterGMTime.Add(time.Second * 600)) {

dbm-services/common/dbha/ha-module/dbmodule/dbmysql/SpiderProxyLayer_switch.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ func (ins *SpiderProxyLayerSwitch) ElectPrimaryCandidate() (*TdbctlInfo, error)
8282
continue
8383
}
8484
if ins.Ip == spider.IP && ins.Port == spider.Port {
85-
ins.ReportLogs(constvar.InfoResult, fmt.Sprintf("skip self node[%s#%d]]", spider.IP, spider.Port))
85+
ins.ReportLogs(constvar.InfoResult, fmt.Sprintf("skip itself [%s#%d] in dbmeta",
86+
spider.IP, spider.Port))
8687
continue
8788
}
8889

@@ -117,6 +118,11 @@ func (ins *SpiderProxyLayerSwitch) ElectPrimaryCandidate() (*TdbctlInfo, error)
117118

118119
ins.ReportLogs(constvar.InfoResult, "try to elect an appropriate node as primary")
119120
for _, node := range nodes {
121+
if node.Host == ins.Ip && ins.AdminPort == node.Port {
122+
ins.ReportLogs(constvar.InfoResult, fmt.Sprintf("skip itself [%s#%d] in route table",
123+
node.Host, node.Port))
124+
continue
125+
}
120126
//1. clusterRole must be Secondary
121127
//should not happen
122128
if strings.EqualFold(node.ClusterRole, PrimaryRole) {

dbm-services/common/dbha/ha-module/dbutil/db_detect.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,9 @@ func (b *BaseDetectDB) GetDBType() types.DBType {
356356

357357
// GetDBRole return
358358
func (b *BaseDetectDB) GetDBRole() string {
359+
if b.DBRole == "" {
360+
return "N/A"
361+
}
359362
return b.DBRole
360363
}
361364

dbm-services/common/dbha/ha-module/gm/connection.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ func (conn *AgentConnection) parse(readLen int) error {
180180

181181
// unpack success
182182
// replay ok
183-
log.Logger.Infof("process net package success. Type:%s, Body:%s",
184-
conn.netPackage.DetectType, conn.netPackage.Body)
183+
log.Logger.Infof("process agent[%s#%d]'s net package success. Type:%s, Body:%s",
184+
conn.Ip, conn.Port, conn.netPackage.DetectType, conn.netPackage.Body)
185185
n, err := conn.NetConnection.Write([]byte("OK"))
186186
if err != nil {
187187
log.Logger.Error("write failed. agent ip:", conn.Ip, " port:", conn.Port)

dbm-services/common/dbha/ha-module/gm/gdm.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package gm
22

33
import (
4+
"dbm-services/common/dbha/ha-module/util"
45
"net"
56
"strconv"
67
"sync"
@@ -105,7 +106,8 @@ func (gdm *GDM) listenAndDoAccept() {
105106
log.Logger.Errorf("accept socket failed. err:%s", err.Error())
106107
continue
107108
} else {
108-
log.Logger.Infof("gdm accept success, agent ip: %v\n", conn.RemoteAddr().String())
109+
log.Logger.Infof("gdm accept success, Local: %v, Remote: %v\n",
110+
conn.LocalAddr().String(), conn.RemoteAddr().String())
109111
}
110112
agentConn := AgentConnection{
111113
NetConnection: conn,
@@ -132,6 +134,8 @@ func (gdm *GDM) isReporterRecently(ins *DoubleCheckInstanceInfo) bool {
132134
log.Logger.Infof("instance[%s#%d] cached, skip report", ip, port)
133135
return true
134136
}
137+
log.Logger.Infof("gdm cache instance:%s, %s",
138+
util.GraceStructString(ins), util.GraceStructString(ins.db))
135139
// 刷新缓存
136140
gdm.ReporterCache[ip] = ins
137141
return false

dbm-ui/backend/db_monitor/tpls/alarm/cloud/dbha二次探测失败电话告警.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"cluster_type",
3636
"appid",
3737
"cluster_domain",
38+
"instance_role",
3839
"server_ip",
3940
"server_port",
4041
"machine_type"
@@ -253,4 +254,4 @@
253254
"alert_source": "event",
254255
"custom_conditions": [],
255256
"export_at": "2024-08-13T15:24:37+08:00"
256-
}
257+
}

0 commit comments

Comments
 (0)