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

server: remaining errors.Is conversions for error equality and inequality checks

Browse Source 
Signed-off-by: redwrasse <mail@redwrasse.io>
This commit is contained in:
redwrasse 2024-09-20 15:50:29 -07:00
parent 5704c6148d
commit 3d63b22912
7 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/etcdserver/api/v3rpc/lease.go
View File

@ -77,7 +77,7 @@ func (ls *LeaseServer) LeaseTimeToLive(ctx context.Context, rr *pb.LeaseTimeToLi
func (ls *LeaseServer) LeaseLeases(ctx context.Context, rr *pb.LeaseLeasesRequest) (*pb.LeaseLeasesResponse, error) {
resp, err := ls.le.LeaseLeases(ctx, rr)
if err != nil && err != lease.ErrLeaseNotFound {
if err != nil && !errors.Is(err, lease.ErrLeaseNotFound) {
return nil, togRPCError(err)
}
if err == lease.ErrLeaseNotFound {

3
server/etcdserver/api/v3rpc/maintenance.go
View File

@ -17,6 +17,7 @@ package v3rpc
import (
"context"
"crypto/sha256"
errorspkg "errors"
"io"
"time"
@ -163,7 +164,7 @@ func (ms *maintenanceServer) Snapshot(sr *pb.SnapshotRequest, srv pb.Maintenance
buf := make([]byte, snapshotSendBufferSize)
n, err := io.ReadFull(pr, buf)
if err != nil && err != io.EOF && err != io.ErrUnexpectedEOF {
if err != nil && err != io.EOF && !errorspkg.Is(err, io.ErrUnexpectedEOF) {
return togRPCError(err)
}
sent += int64(n)

3
server/etcdserver/apply/uber_applier.go
View File

@ -16,6 +16,7 @@ package apply
import (
"context"
"errors"
"time"
"go.uber.org/zap"
@ -123,7 +124,7 @@ func (a *uberApplier) dispatch(ctx context.Context, r *pb.InternalRaftRequest) *
op := "unknown"
ar := &Result{}
defer func(start time.Time) {
success := ar.Err == nil || ar.Err == mvcc.ErrCompacted
success := ar.Err == nil || errors.Is(ar.Err, mvcc.ErrCompacted)
txn.ApplySecObserve(v3Version, op, success, time.Since(start))
txn.WarnOfExpensiveRequest(a.lg, a.warningApplyDuration, start, &pb.InternalRaftStringer{Request: r}, ar.Resp, ar.Err)
if !success {

3
server/proxy/grpcproxy/health.go
View File

@ -16,6 +16,7 @@ package grpcproxy
import (
"context"
"errors"
"fmt"
"net/http"
"time"
@ -52,7 +53,7 @@ func checkHealth(c *clientv3.Client) etcdhttp.Health {
ctx, cancel := context.WithTimeout(c.Ctx(), time.Second)
_, err := c.Get(ctx, "a")
cancel()
if err == nil || err == rpctypes.ErrPermissionDenied {
if err == nil || errors.Is(err, rpctypes.ErrPermissionDenied) {
h.Health = "true"
} else {
h.Reason = fmt.Sprintf("GET ERROR:%s", err)

3
server/storage/backend/batch_tx.go
View File

@ -16,6 +16,7 @@ package backend
import (
"bytes"
"errors"
"math"
"sync"
"sync/atomic"
@ -125,7 +126,7 @@ func (t *batchTx) UnsafeCreateBucket(bucket Bucket) {
func (t *batchTx) UnsafeDeleteBucket(bucket Bucket) {
err := t.tx.DeleteBucket(bucket.Name())
if err != nil && err != bolterrors.ErrBucketNotFound {
if err != nil && !errors.Is(err, bolterrors.ErrBucketNotFound) {
t.backend.lg.Fatal(
"failed to delete a bucket",
zap.Stringer("bucket-name", bucket),

3
server/storage/storage.go
View File

@ -15,6 +15,7 @@
package storage
import (
"errors"
"sync"
"github.com/coreos/go-semver/semver"
@ -112,7 +113,7 @@ func (st *storage) MinimalEtcdVersion() *semver.Version {
walsnap := walpb.Snapshot{}
sn, err := st.s.Load()
if err != nil && err != snap.ErrNoSnapshot {
if err != nil && !errors.Is(err, snap.ErrNoSnapshot) {
panic(err)
}
if sn != nil {

2
server/storage/wal/wal_test.go
View File

@ -922,7 +922,7 @@ func TestOpenOnTornWrite(t *testing.T) {
p := t.TempDir()
w, err := Create(zaptest.NewLogger(t), p, nil)
defer func() {
if err = w.Close(); err != nil && err != os.ErrInvalid {
if err = w.Close(); err != nil && !errors.Is(os.ErrInvalid, err) {
t.Fatal(err)
}
}()