Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not log context cancelled as error #392

Merged
merged 1 commit into from
Jan 29, 2025
Merged

Do not log context cancelled as error #392

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions pkg/server/kv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package server

import (
"context"
"errors"

"github.com/sirupsen/logrus"
"go.etcd.io/etcd/api/v3/etcdserverpb"
Expand Down Expand Up @@ -50,7 +51,9 @@ func (k *KVServerBridge) Range(ctx context.Context, r *etcdserverpb.RangeRequest

resp, err := k.limited.Range(ctx, r)
if err != nil {
logrus.Errorf("error while range on %s %s: %v", r.Key, r.RangeEnd, err)
if !errors.Is(err, context.Canceled) {
logrus.Errorf("error while range on %s %s: %v", r.Key, r.RangeEnd, err)
}
return nil, err
}

Expand Down Expand Up @@ -103,7 +106,9 @@ func (k *KVServerBridge) DeleteRange(ctx context.Context, r *etcdserverpb.Delete
func (k *KVServerBridge) Txn(ctx context.Context, r *etcdserverpb.TxnRequest) (*etcdserverpb.TxnResponse, error) {
res, err := k.limited.Txn(ctx, r)
if err != nil {
logrus.Errorf("error in txn %s: %v", r, err)
if !errors.Is(err, context.Canceled) {
logrus.Errorf("error in txn %s: %v", r, err)
}
}
return res, err
}
Expand Down
Loading