Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(dbm-services): dbha optimize log info #6816

Merged
merged 1 commit into from
Sep 11, 2024
Merged

feat(dbm-services): dbha optimize log info #6816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 15 additions & 18 deletions dbm-services/common/dbha/ha-module/client/hadb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ func (c *HaDBClient) ReportDBStatus(app, agentIp, ip string, port int, dbType, s
},
}

log.Logger.Debugf("update instance detect status param:%#v", updateReq)
log.Logger.Debugf("update instance detect status param:%#v", util.GraceStructString(updateReq))

response, err := c.DoNew(http.MethodPost,
c.SpliceUrlByPrefix(c.Conf.UrlPre, constvar.DbStatusUrl, ""), updateReq, nil)
Expand Down Expand Up @@ -218,7 +218,7 @@ func (c *HaDBClient) ReportDBStatus(app, agentIp, ip string, port int, dbType, s
},
}

log.Logger.Debugf("insert instance status param:%v", updateReq)
log.Logger.Debugf("insert instance status param:%v", util.GraceStructString(updateReq))

response, err = c.DoNew(http.MethodPost,
c.SpliceUrlByPrefix(c.Conf.UrlPre, constvar.DbStatusUrl, ""), insertReq, nil)
Expand Down Expand Up @@ -257,7 +257,7 @@ func (c *HaDBClient) ReportHaLog(monIP, app, ip string, port int, module, commen
},
}

log.Logger.Debugf("ReportHaLog param:%#v", req)
log.Logger.Debugf("ReportHaLog param:%#v", util.GraceStructString(req))

response, err := c.DoNew(http.MethodPost,
c.SpliceUrlByPrefix(c.Conf.UrlPre, constvar.HaLogsUrl, ""), req, nil)
Expand Down Expand Up @@ -305,7 +305,7 @@ func (c *HaDBClient) RegisterDBHAInfo(
},
}

log.Logger.Debugf("RegisterDBHAInfo param:%#v", req)
log.Logger.Debugf("RegisterDBHAInfo param:%#v", util.GraceStructString(req))

response, err := c.DoNew(http.MethodPost,
c.SpliceUrlByPrefix(c.Conf.UrlPre, constvar.HaStatusUrl, ""), req, nil)
Expand Down Expand Up @@ -341,7 +341,7 @@ func (c *HaDBClient) GetAliveAgentInfo(cityID int, dbType string, interval int)
},
}

log.Logger.Debugf("GetAliveAgentInfo param:%#v", req)
log.Logger.Debugf("GetAliveAgentInfo param:%#v", util.GraceStructString(req))

response, err := c.DoNew(http.MethodPost,
c.SpliceUrlByPrefix(c.Conf.UrlPre, constvar.HaStatusUrl, ""), req, nil)
Expand Down Expand Up @@ -372,7 +372,7 @@ func (c *HaDBClient) GetAliveHAComponent(module string, interval int) ([]GMInfo,
},
}

log.Logger.Debugf("GetAliveHAInfo param:%#v", req)
log.Logger.Debugf("GetAliveHAInfo param:%#v", util.GraceStructString(req))

response, err := c.DoNew(http.MethodPost,
c.SpliceUrlByPrefix(c.Conf.UrlPre, constvar.HaStatusUrl, ""), req, nil)
Expand Down Expand Up @@ -416,7 +416,7 @@ func (c *HaDBClient) ReporterAgentHeartbeat(agentIP, detectType string, interval
},
}

log.Logger.Debugf("ReporterAgentHeartbeat param:%#v", req)
log.Logger.Debugf("ReporterAgentHeartbeat param:%#v", util.GraceStructString(req))

response, err := c.DoNew(http.MethodPost,
c.SpliceUrlByPrefix(c.Conf.UrlPre, constvar.HaStatusUrl, ""), req, nil)
Expand Down Expand Up @@ -453,7 +453,7 @@ func (c *HaDBClient) ReporterGMHeartbeat(gmIP, module string, interval int) erro
},
}

log.Logger.Debugf("ReporterGMHeartbeat param:%#v", req)
log.Logger.Debugf("ReporterGMHeartbeat param:%#v", util.GraceStructString(req))

response, err := c.DoNew(http.MethodPost,
c.SpliceUrlByPrefix(c.Conf.UrlPre, constvar.HaStatusUrl, ""), req, nil)
Expand Down Expand Up @@ -487,7 +487,7 @@ func (c *HaDBClient) QuerySingleTotal(ip string, port int, interval int) (int, e
},
}

log.Logger.Debugf("QuerySingleTotal param:%#v", req)
log.Logger.Debugf("QuerySingleTotal param:%#v", util.GraceStructString(req))

response, err := c.DoNew(http.MethodPost,
c.SpliceUrlByPrefix(c.Conf.UrlPre, constvar.SwitchQueueUrl, ""), req, nil)
Expand Down Expand Up @@ -520,7 +520,7 @@ func (c *HaDBClient) QueryIntervalTotal(interval int) (int, error) {
},
}

log.Logger.Debugf("QueryIntervalTotal param:%#v", req)
log.Logger.Debugf("QueryIntervalTotal param:%#v", util.GraceStructString(req))

response, err := c.DoNew(http.MethodPost,
c.SpliceUrlByPrefix(c.Conf.UrlPre, constvar.SwitchQueueUrl, ""), req, nil)
Expand Down Expand Up @@ -555,7 +555,7 @@ func (c *HaDBClient) QuerySingleIDC(ip string, idc int) (int, error) {
},
}

log.Logger.Debugf("QuerySingleIDC param:%#v", req)
log.Logger.Debugf("QuerySingleIDC param:%#v", util.GraceStructString(req))

response, err := c.DoNew(http.MethodPost,
c.SpliceUrlByPrefix(c.Conf.UrlPre, constvar.SwitchQueueUrl, ""), req, nil)
Expand Down Expand Up @@ -589,7 +589,7 @@ func (c *HaDBClient) UpdateTimeDelay(ip string, port int, app string) error {
},
}

log.Logger.Debugf("UpadteTimeDelay param:%#v", req)
log.Logger.Debugf("UpadteTimeDelay param:%#v", util.GraceStructString(req))

response, err := c.DoNew(http.MethodPost, c.SpliceUrl(constvar.UpdateTimeDelay, ""), req, nil)
if err != nil {
Expand All @@ -602,17 +602,14 @@ func (c *HaDBClient) UpdateTimeDelay(ip string, port int, app string) error {
if err != nil {
return err
}
// if result.RowsNum != 1 {
// log.Logger.Fatalf("bug: ReporterAgentHeartbeat affect rows %d", result.RowsNum)
// }
return nil
}

// InsertSwitchQueue insert pre-switch instance to switch queue
func (c *HaDBClient) InsertSwitchQueue(reqInfo *SwitchQueueRequest) (uint, error) {
var result SwitchQueueResponse

log.Logger.Debugf("InsertSwitchQueue param:%#v", reqInfo)
log.Logger.Debugf("InsertSwitchQueue param:%#v", util.GraceStructString(reqInfo))

response, err := c.DoNew(http.MethodPost,
c.SpliceUrlByPrefix(c.Conf.UrlPre, constvar.SwitchQueueUrl, ""), reqInfo, nil)
Expand Down Expand Up @@ -663,7 +660,7 @@ func (c *HaDBClient) QuerySlaveCheckConfig(ip string, port int, app string) (int
func (c *HaDBClient) UpdateSwitchQueue(reqInfo *SwitchQueueRequest) error {
var result SwitchQueueResponse

log.Logger.Debugf("UpdateSwitchQueue param:%#v", reqInfo)
log.Logger.Debugf("UpdateSwitchQueue param:%#v", util.GraceStructString(reqInfo))

response, err := c.DoNew(http.MethodPost,
c.SpliceUrlByPrefix(c.Conf.UrlPre, constvar.SwitchQueueUrl, ""), reqInfo, nil)
Expand Down Expand Up @@ -700,7 +697,7 @@ func (c *HaDBClient) InsertSwitchLog(swId uint, ip string, port int, app, result
},
}

log.Logger.Debugf("InsertSwitchLog param:%#v", req)
log.Logger.Debugf("InsertSwitchLog param:%#v", util.GraceStructString(req))

response, err := c.DoNew(http.MethodPost,
c.SpliceUrlByPrefix(c.Conf.UrlPre, constvar.SwitchLogUrl, ""), req, nil)
Expand Down
12 changes: 12 additions & 0 deletions dbm-services/common/dbha/ha-module/util/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package util

import (
"bytes"
"encoding/json"
"fmt"
"hash/crc32"
"net"
Expand Down Expand Up @@ -145,3 +146,14 @@ func IntSlice2String(elements []int, sep string) string {
}
return elemStr
}

// GraceStructString grace struct info to string
func GraceStructString(v interface{}) string {
// 使用 json.MarshalIndent 序列化结构体，便于阅读
data, err := json.MarshalIndent(v, "", " ")
if err != nil {
log.Logger.Debugf("Failed to marshal struct: %v", err)
return ""
}
return fmt.Sprintf("%s", data)
}
Loading