percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-11 13:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #750 from ylacancellera/PT-2298_pt-galera-log-explainer_superfluous_lines_on_conflicts

Browse Source 
PT-2298 pt-galera-log-explainer superfluous lines on conflicts
This commit is contained in:
Yoann La Cancellera
2024-01-26 12:36:24 +01:00
committed by GitHub
parent c365fd371b 3bdc4b95ba
commit 51ce07ce22
4 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/go/pt-galera-log-explainer/main_test.go
View File

@@ -103,6 +103,12 @@ func TestMain(t *testing.T) {
cmd: []string{"conflicts"},
path: "tests/logs/conflict/*",
},
{
name: "conflict_list_all_no_color",
cmd: []string{"list", "--all", "--no-color"},
path: "tests/logs/conflict/*",
},
}
TESTS:

11
src/go/pt-galera-log-explainer/regex/applicative.go
View File

@@ -92,13 +92,16 @@ var ApplicativeMap = types.RegexMap{
return logCtx, func(logCtx types.LogCtx) string {
for _, name := range logCtx.OwnNames {
vote, ok := latestConflict.VotePerNode[name]
if !ok {
for _, localname := range logCtx.OwnNames {
if node != localname {
// don't print other nodes vote, their should be in their own column
// else it just takes too much place without adding much usability
continue
}
return voteResponse(vote, *latestConflict)
if vote, ok := latestConflict.VotePerNode[localname]; ok {
return voteResponse(vote, *latestConflict)
}
}
return ""

12
src/go/pt-galera-log-explainer/tests/expected/conflict_list_all_no_color Normal file
View File

@@ -0,0 +1,12 @@
identifier node1
current path tests/logs/conflict/node.log
last known ip
last known name node1
mysql version
2023-10-21T04:01:01.700706Z inconsistency vote started(seqno:102573168)
consistency vote(seqno:102573168): lost
2023-10-21T04:01:01.701512Z found inconsistent by vote
2023-10-21T04:01:01.704318Z NON-PRIMARY(n=1)
2023-10-21T04:01:01.704384Z SYNCED -> OPEN
2023-10-21T04:01:01.704465Z OPEN -> CLOSED

2
src/go/pt-galera-log-explainer/types/timeline.go
View File

@@ -139,7 +139,7 @@ func getlasttime(l LocalTimeline) time.Time {
func CutTimelineAt(t LocalTimeline, at time.Time) LocalTimeline {
var i int
for i = 0; i < len(t); i++ {
if t[i].Date.Time.After(at) {
if t[i].Date != nil && t[i].Date.Time.After(at) {
break
}
}