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

Jump to bottom

Add error log to receiver and clarify bad replica error message #4394

Merged
merged 5 commits into from
Jul 2, 2021
Merged

Add error log to receiver and clarify bad replica error message #4394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f1597d7
add error log to handleRequest unhappy path
bill3tt Jul 1, 2021
d504087
add CHANGELOG
bill3tt Jul 1, 2021
99ca6a1
retest
bill3tt Jul 1, 2021
67fa452
retest
bill3tt Jul 1, 2021
d98d076
third time is a charm
bill3tt Jul 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re

### Added

- [#4394](https://github.com/thanos-io/thanos/pull/4394) Add error logs to receiver when write request rejected with invalid replica
- [#4384](https://github.com/thanos-io/thanos/pull/4384) Fix the experimental PromQL editor when used on multiple line.
- [#4299](https://github.com/thanos-io/thanos/pull/4299) Tracing: Add tracing to exemplar APIs.
- [#4327](https://github.com/thanos-io/thanos/pull/4327) Add environment variable substitution to all YAML configuration flags.
Expand Down
4 changes: 3 additions & 1 deletion pkg/receive/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ var (
// errConflict is returned whenever an operation fails due to any conflict-type error.
errConflict = errors.New("conflict")

errBadReplica = errors.New("replica count exceeds replication factor")
errBadReplica = errors.New("request replica exceeds receiver replication factor")
errNotReady = errors.New("target not ready")
errUnavailable = errors.New("target not available")
)
Expand Down Expand Up @@ -258,6 +258,8 @@ type replica struct {
func (h *Handler) handleRequest(ctx context.Context, rep uint64, tenant string, wreq *prompb.WriteRequest) error {
// The replica value in the header is one-indexed, thus we need >.
if rep > h.options.ReplicationFactor {
level.Error(h.logger).Log("err", errBadReplica, "msg", "write request rejected",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we do this in the place where error is handled? Handling error twice (by returning and logging) is a bad smell 🙈

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could 👍 I chose not to as we would then need to replicate this in two places in a switch statement (here & here).

I felt this was slightly tidier, but happy to be convinced otherwise 🤷‍♂️

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm... there is a risk we will handle things twice, but not a biggie! (:

"request_replica", rep, "replication_factor", h.options.ReplicationFactor)
return errBadReplica
}

Expand Down