Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

*: fix stylecheck linter

Browse Source 
Signed-off-by: Wei Fu <fuweid89@gmail.com>
This commit is contained in:
Wei Fu 2023-09-25 19:12:50 +08:00
parent 149bcb75ea
commit 896d161d16
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/v3/ordering/kv_test.go
View File

@ -16,7 +16,6 @@ package ordering
import ( import (
"context" "context"
gContext "context"
"sync" "sync"
"testing" "testing"
@ -29,7 +28,7 @@ type mockKV struct {
response clientv3.OpResponse response clientv3.OpResponse
} }
func (kv *mockKV) Do(ctx gContext.Context, op clientv3.Op) (clientv3.OpResponse, error) { func (kv *mockKV) Do(ctx context.Context, op clientv3.Op) (clientv3.OpResponse, error) {
return kv.response, nil return kv.response, nil
} }

7
server/etcdserver/api/etcdhttp/health.go
View File

@ -23,7 +23,6 @@ import (
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"go.uber.org/zap" "go.uber.org/zap"
"go.etcd.io/etcd/api/v3/etcdserverpb"
pb "go.etcd.io/etcd/api/v3/etcdserverpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/server/v3/auth" "go.etcd.io/etcd/server/v3/auth"
@ -154,9 +153,9 @@ func checkAlarms(lg *zap.Logger, srv ServerHealth, excludedAlarms AlarmSet) Heal
h.Health = "false" h.Health = "false"
switch v.Alarm { switch v.Alarm {
case etcdserverpb.AlarmType_NOSPACE: case pb.AlarmType_NOSPACE:
h.Reason = "ALARM NOSPACE" h.Reason = "ALARM NOSPACE"
case etcdserverpb.AlarmType_CORRUPT: case pb.AlarmType_CORRUPT:
h.Reason = "ALARM CORRUPT" h.Reason = "ALARM CORRUPT"
default: default:
h.Reason = "ALARM UNKNOWN" h.Reason = "ALARM UNKNOWN"
@ -183,7 +182,7 @@ func checkAPI(lg *zap.Logger, srv ServerHealth, serializable bool) Health {
h := Health{Health: "true"} h := Health{Health: "true"}
cfg := srv.Config() cfg := srv.Config()
ctx, cancel := context.WithTimeout(context.Background(), cfg.ReqTimeout()) ctx, cancel := context.WithTimeout(context.Background(), cfg.ReqTimeout())
_, err := srv.Range(ctx, &etcdserverpb.RangeRequest{KeysOnly: true, Limit: 1, Serializable: serializable}) _, err := srv.Range(ctx, &pb.RangeRequest{KeysOnly: true, Limit: 1, Serializable: serializable})
cancel() cancel()
if err != nil && err != auth.ErrUserEmpty && err != auth.ErrPermissionDenied { if err != nil && err != auth.ErrUserEmpty && err != auth.ErrPermissionDenied {
h.Health = "false" h.Health = "false"

2
tools/.golangci.yaml
View File

@ -21,7 +21,7 @@ linters:
- ineffassign - ineffassign
- revive - revive
- staticcheck - staticcheck
# - stylecheck # TODO: enable by #16610 - stylecheck
# - unused # TODO: enable by #16610 # - unused # TODO: enable by #16610
# - unconvert # Remove unnecessary type conversions TODO: enable by #16610 # - unconvert # Remove unnecessary type conversions TODO: enable by #16610
linters-settings: # please keep this alphabetized linters-settings: # please keep this alphabetized