From b34dfb8de0d8182a68f3a3337e7ca469b2bbf188 Mon Sep 17 00:00:00 2001 From: slasher Date: Tue, 23 Jul 2024 15:26:17 +0800 Subject: [PATCH] chore(util): add default of switch, update err judgment @formatter:off Signed-off-by: slasher Signed-off-by: JasonHu520 --- blobstore/blobnode/heartbeat.go | 1 + blobstore/common/taskswitch/task_switch.go | 3 ++- blobstore/common/trace/span_options.go | 4 +++- util/errors/panichook.go | 1 + util/string.go | 2 ++ 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/blobstore/blobnode/heartbeat.go b/blobstore/blobnode/heartbeat.go index 210413713..4023d31c2 100644 --- a/blobstore/blobnode/heartbeat.go +++ b/blobstore/blobnode/heartbeat.go @@ -102,6 +102,7 @@ func (s *Service) syncDiskStatus(ctx context.Context, diskInfosRet []*cmapi.Disk span.Warnf("disk drop: diskID:%d local.Status:%v, cm.status:%v", diskID, ds.Status(), status) s.handleDiskDrop(ctx, ds) continue + default: } } } diff --git a/blobstore/common/taskswitch/task_switch.go b/blobstore/common/taskswitch/task_switch.go index 918b66156..2cbbd3cec 100644 --- a/blobstore/common/taskswitch/task_switch.go +++ b/blobstore/common/taskswitch/task_switch.go @@ -17,6 +17,7 @@ package taskswitch import ( "context" "errors" + "strings" "sync" "time" @@ -127,7 +128,7 @@ func (sm *SwitchMgr) update() { statusStr, err := sm.accessor.GetConfig(ctx, switchName) if err != nil { span.Errorf("Get Fail switchName %s err %v", switchName, err) - if err == errcode.ErrNotFound { + if strings.Contains(err.Error(), errcode.ErrNotFound.Error()) { if err = sm.accessor.SetConfig(ctx, switchName, SwitchClose); err != nil { span.Errorf("Set Fail switchName %s err %v", switchName, err) } diff --git a/blobstore/common/trace/span_options.go b/blobstore/common/trace/span_options.go index 63aef25e2..a5fd9f4d0 100644 --- a/blobstore/common/trace/span_options.go +++ b/blobstore/common/trace/span_options.go @@ -50,6 +50,7 @@ func (d spanOptionDuration) Value(duration time.Duration) int64 { v = int64(duration / time.Minute) case durationHour: v = int64(duration / time.Hour) + default: } return v } @@ -68,8 +69,9 @@ func (d spanOptionDuration) Unit(duration time.Duration) string { return "m" case durationHour: return "h" + default: + return "" } - return "" } type spanOptions struct { diff --git a/util/errors/panichook.go b/util/errors/panichook.go index 69a6edbc8..e709ca074 100644 --- a/util/errors/panichook.go +++ b/util/errors/panichook.go @@ -100,6 +100,7 @@ func SupportPanicHook() (ok bool) { switch runtime.GOARCH { case "amd64", "386": ok = supportTest() + default: } return } diff --git a/util/string.go b/util/string.go index e0450b18e..40098a479 100644 --- a/util/string.go +++ b/util/string.go @@ -231,6 +231,8 @@ func String2Any(str string, pvalue interface{}) error { *v = complex64(val.(complex128)) case *complex128: *v = complex128(val.(complex128)) + + default: } return nil }