From 9dbed00bee90ae9cd7592ba7390697142ecdf46e Mon Sep 17 00:00:00 2001 From: Yoann La Cancellera Date: Thu, 21 Mar 2024 19:52:25 +0100 Subject: [PATCH] pt-galera-log-explainer: fixed nitpicks from review --- src/go/pt-galera-log-explainer/translate/translate.go | 2 +- src/go/pt-galera-log-explainer/whois.go | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/go/pt-galera-log-explainer/translate/translate.go b/src/go/pt-galera-log-explainer/translate/translate.go index 1492bfa7..12ad5371 100644 --- a/src/go/pt-galera-log-explainer/translate/translate.go +++ b/src/go/pt-galera-log-explainer/translate/translate.go @@ -70,7 +70,7 @@ func AddHashToIP(hash, ip string, ts time.Time) { db.rwlock.Lock() defer db.rwlock.Unlock() latestValue, ok := db.HashToIP[hash] - if !ok { + if !ok || latestValue == nil { db.HashToIP[hash] = &translationUnit{Value: ip, Timestamp: ts} } else { latestValue.UpdateTimestamp(ts) diff --git a/src/go/pt-galera-log-explainer/whois.go b/src/go/pt-galera-log-explainer/whois.go index 7f346786..e0e0e26b 100644 --- a/src/go/pt-galera-log-explainer/whois.go +++ b/src/go/pt-galera-log-explainer/whois.go @@ -33,14 +33,15 @@ Regarding UUIDs (wsrep_gcomm_uuid), different format can be found in logs depend func (w *whois) Run() error { if w.SearchType == "auto" { - if regex.IsNodeUUID(w.Search) { + switch { + case regex.IsNodeUUID(w.Search): w.Search = utils.UUIDToShortUUID(w.Search) w.SearchType = "uuid" - } else if regex.IsNodeIP(w.Search) { + case regex.IsNodeIP(w.Search): w.SearchType = "ip" - } else if len(w.Search) != 8 { // at this point it's only a doubt between names and legacy node uuid, where only the first part of the uuid was shown in log + case len(w.Search) != 8: w.SearchType = "nodename" - } else { + default: log.Info().Msg("input information's type is ambiguous, scanning files to discover the type. You can also provide --type to avoid auto-detection") } }