mirror of
https://github.com/milvus-io/milvus.git
synced 2026-07-21 02:05:41 +00:00
issue: #47420 ## What this PR does Project-wide migration of raw `fmt.Errorf` / `errors.New` in function bodies onto the `merr` framework, plus the Sys-vs-Input error classification and the machinery it drives (retriability, fine-grained metrics, segcore unification), plus the convention docs and a linter that keeps it from regressing. Scope: storage, proxy, coordinators (root/data/query), query node, data node, `pkg/util` & `internal/util`, expression parser, message queue, streaming, and misc packages. Bare raw-error usages went from ~3000 to a ~340 allowlist (package-level sentinels / build-tag / test sites). --- ## How to review this PR It is large but the vast majority is mechanical. Changes fall into three tiers; spend review budget on Part 2 and Part 3. ### Part 1 — Mechanical standardization (low risk, verify by rule) Each converted call follows one of a small fixed set of rules. To review, check that each site obeys the matching rule rather than reading every line: | Pattern | Rule | |---|---| | `fmt.Errorf("...")` originating a new error | → `merr.WrapErrXxxMsg("...")` with a code matching the failure's meaning | | Adding context to an existing typed error | → `merr.Wrap(err, "...")` / `merr.Wrapf(...)` — **preserves** the inner code (never `WrapErr*Err`, which overwrites it) | | Errors inside the streaming subsystem | → `status.New*` factories (StreamingError), **not** merr — this is the component-internal dialect (see `docs/dev/error_handling_guide.md`) | | Low-level / control-flow signal caught by `errors.Is` | → kept as a package-level `errors.New` sentinel (lowercase, same-package) | Conventions are documented in `docs/dev/error_handling_guide.md` (how-to) and `docs/dev/error_sentinel_convention.md` (rules + audit). A `gocritic`/`ruleguard` rule (`rawmerrerror`, in `rules.go`) enforces "no raw `return errors.New/fmt.Errorf`" under `make verifiers`. ### Part 2 — Behavior changes (review these closely) These are the sites where the wire contract or runtime behavior changes, not just the source text. Listed by category; representative locations given, full set in the diff. **A. gRPC wire-code shifts: `UnexpectedError(1)/Code 65535` → typed code.** Where a handler previously returned a raw error (collapsed to `Code=65535` on the wire), it now returns a typed merr, so the client sees a real code. The most common shift is to `IllegalArgument(5)/Code 1100` (ParameterInvalid). Touch points include datanode task handlers (CreateTask/Query/Drop), proxy Upsert, querynode GetMetrics, datacoord CreateIndex, httpserver query-response builder, and typeutil schema validation. One code refinement: an index-param validation moved `1100` → `1101` (ParameterMissing). **Client/SDK assertions and any code that switched on `Code=65535` for these paths must be re-checked** (the go_client e2e assertions were already aligned in this PR). **B. Prometheus `status` label contract change (externally visible).** The proxy metric's coarse `fail` / `rejected` values are split into `fail_input` / `fail_system` and `rejected_user` / `rejected_system` (in `requestutil.ParseMetricLabel`; auth/privilege rejections count as `rejected_user`), so dashboards can attribute a failure to caller vs operator. **Dashboards/alerts querying `status="fail"` must migrate to `status=~"fail_.*"`, and `status="rejected"` to `status=~"rejected_.*"`.** The in-repo Grafana dashboard is already migrated; external dashboards built on the old values silently go empty after upgrade. This is the one change that requires an ops-side migration. **C. Retriability semantics.** - C1: `merr.Status(err)` now forces `Retriable=false` when the error is an `InputError` — a malformed request can never succeed on blind retry, so clients never get the self-contradictory "your input is wrong but you may retry". - C2: `retry.Do` short-circuits an `InputError` (non-retriable) — **but only when the caller did not pass a `RetryErr` predicate**. The check is an `if c.isRetryErr != nil { ... } else if InputError { ... }` *mutually exclusive* branch (`pkg/util/retry/retry.go`): an explicit `RetryErr` takes precedence and bypasses the InputError abort. `retry.Handle` deliberately does **not** apply the InputError abort (its callers signal abort via `shouldRetry=false`). Four flusher startup callsites that must retry through transient "not ready" errors were given explicit `RetryErr` escape hatches. **D. segcore (C++→Go) error classification.** A single shared Go-side table (`pkg/util/merr/segcore.go`) maps each segcore code to a merr sentinel + InputError/signal category, replacing scattered hand-written `if errorCode == ...` switches in the cgo wrappers. **Wire `Code` values change for every segcore pass-through error, not just the remapped ones.** Named sentinels remap (C++ `2003` → merr `2001`, `2033` → `2002`, Folly/Knowhere codes likewise); **all remaining pass-through codes (`2004`–`2043`, previously surfaced to clients as raw C++ enum values) now serialize as `2000`** (`ErrSegcore`), with the original C++ code preserved in the `Reason` text (`segcoreCode=...`); unknown/future codes collapse to `2000` as well (pinned by the `wire_code_projection` test). Transient segcore classes (object storage / file IO / OOM / mmap / FieldNotLoaded — 11 codes) now report `Retriable=true`. **Any client switching on raw segcore codes in the `2004`–`2043` range must be re-checked**; the in-Reason code remains available for diagnostics. Signal codes (PretendFinished / FollyCancel) are recognized centrally. `errors.Is`-based control flow on these (e.g. scheduler skip/retry) is preserved. **E. InputError classification (25 sentinels + dynamic marks).** 25 sentinels in `errors.go` carry `WithErrorType(InputError)` (the Collection / ResourceGroup / Database families, `ErrIndexDuplicate`, `ErrParameterInvalid`, `ErrPrivilegeNotAuthenticated`, `ErrImportFailed`, `ErrQueryPlan`, ...), plus dynamic marks for the 8 segcore input codes (ExprInvalid, DimNotMatch, MetricTypeInvalid, FieldIDInvalid, ...) and `WrapErrAsInputError`. The widest blast radius is `ErrParameterInvalid` (1100): ~2335 `WrapErrParameterInvalid*` callsites now classify as input / non-retriable. Because of C1/C2 this changes retriability for any path that returns these. **The audit to confirm no transient path was mis-marked is the single most important review item** (see Part 3). One reverse correction: storage field-stats parsing moved from `ErrParameterInvalid` (input) to `ErrDataIntegrity` — a corrupted stored stat is data corruption, not user input. ### Part 3 — Known risks & traps (called out proactively) 1. **`merr.Wrap` vs `WrapErr*Err` (code-masking).** `WrapErr*Err` builds a `wrappedMilvusError{sentinel: ErrServiceInternal}` whose `code()` returns the *outer* sentinel — it overwrites the inner typed code and hides the `errors.Is` chain. This is intentional (use it to *deliberately* downgrade), but it was a recurring conversion defect; the rule "add context with `merr.Wrap`, downgrade with `WrapErr*Err`" is enforced by convention and reviewed across the diff. 2. **InputError × `retry.Do` blast radius.** Marking a sentinel `InputError` makes any `retry.Do(...)` without a `RetryErr` predicate stop retrying it. Reviewers should sanity-check that no transient use of the 19 newly-marked sentinels (especially `ErrParameterInvalid`) sits inside a retry loop that needed to keep spinning. The known flusher cases were handled (see C2). 3. **The ~340 raw-error allowlist.** What remains as bare `errors.New` is, by design: package-level sentinels (caught by `errors.Is`), `//go:build test` sites, and out-of-band trees (`cmd/`, `tests/`, codegen, walimpls). The linter only bans the *direct-return* form; assignment-then-return escapes and the full no-exceptions ban are deferred to an AST-based linter (Tier 2, documented). 4. **segcore C++ second step deferred.** This PR unifies classification on the Go side; splitting the dual-semantic C++ codes at the source is a follow-up. --- ## Validation - `make verifiers`: Go side clean (gofmt + static-check across modules, including the new `rawmerrerror` rule with a 0-hit baseline repo-wide). - `make test-go`: passing; the one real regression introduced (a datanode `invalid_task_type` assertion shifting `1` → `5` from a ParameterInvalid conversion) was fixed in-tree. - go_client e2e CreateIndex assertions aligned to the new merr messages. --------- Signed-off-by: zhenshan.cao <zhenshan.cao@zilliz.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
228 lines
6.8 KiB
Go
228 lines
6.8 KiB
Go
// Licensed to the LF AI & Data foundation under one
|
|
// or more contributor license agreements. See the NOTICE file
|
|
// distributed with this work for additional information
|
|
// regarding copyright ownership. The ASF licenses this file
|
|
// to you under the Apache License, Version 2.0 (the
|
|
// "License"); you may not use this file except in compliance
|
|
// with the License. You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package replicatestream
|
|
|
|
import (
|
|
"context"
|
|
"sync"
|
|
|
|
message "github.com/milvus-io/milvus/pkg/v3/streaming/util/message"
|
|
)
|
|
|
|
// MsgQueue exposes the required operations. We include context support to meet the
|
|
// blocking + cancel requirements.
|
|
// The names mirror the user's suggestion with small adjustments for clarity.
|
|
type MsgQueue interface {
|
|
// Enqueue appends a message. Blocks if capacity is full until space appears
|
|
// (via CleanupConfirmedMessages) or ctx is canceled.
|
|
Enqueue(ctx context.Context, msg message.ImmutableMessage) error
|
|
|
|
// ReadNext returns the next message from the current read cursor and advances
|
|
// the cursor by one. It does NOT delete the message from the queue storage.
|
|
// Blocks when there are no readable messages (i.e., cursor is at tail) until
|
|
// a new message is Enqueued or ctx is canceled.
|
|
ReadNext(ctx context.Context) (message.ImmutableMessage, error)
|
|
|
|
// SeekToHead moves the read cursor to the first not-yet-deleted message.
|
|
SeekToHead()
|
|
|
|
// CleanupConfirmedMessages permanently removes all messages whose Timetick()
|
|
// <= lastConfirmedTimeTick. This may free capacity and wake Enqueue waiters.
|
|
// Returns the messages that were cleaned up.
|
|
CleanupConfirmedMessages(lastConfirmedTimeTick uint64) []message.ImmutableMessage
|
|
|
|
// Len returns the number of stored (not yet deleted) messages.
|
|
Len() int
|
|
|
|
// Cap returns the maximum capacity of the queue.
|
|
Cap() int
|
|
}
|
|
|
|
var _ MsgQueue = (*msgQueue)(nil)
|
|
|
|
// msgQueue is a bounded, in-memory implementation of MsgQueue.
|
|
// It uses a simple slice for storage and an integer read cursor that is always
|
|
// within [0, len(buf)].
|
|
type msgQueue struct {
|
|
mu sync.Mutex
|
|
notEmpty *sync.Cond
|
|
notFull *sync.Cond
|
|
|
|
buf []message.ImmutableMessage
|
|
bufBytes int
|
|
readIdx int
|
|
cap int
|
|
maxSize int
|
|
closed bool
|
|
}
|
|
|
|
type MsgQueueOptions struct {
|
|
Capacity int
|
|
MaxSize int
|
|
}
|
|
|
|
// NewMsgQueue creates a queue with a fixed capacity (>0).
|
|
func NewMsgQueue(options MsgQueueOptions) *msgQueue {
|
|
if options.Capacity <= 0 {
|
|
panic("capacity must be > 0")
|
|
}
|
|
if options.MaxSize <= 0 {
|
|
panic("max size must be > 0")
|
|
}
|
|
q := &msgQueue{cap: options.Capacity, maxSize: options.MaxSize}
|
|
q.notEmpty = sync.NewCond(&q.mu)
|
|
q.notFull = sync.NewCond(&q.mu)
|
|
return q
|
|
}
|
|
|
|
func (q *msgQueue) Len() int {
|
|
q.mu.Lock()
|
|
defer q.mu.Unlock()
|
|
return len(q.buf)
|
|
}
|
|
|
|
func (q *msgQueue) Cap() int { return q.cap }
|
|
|
|
// Enqueue implements a blocking producer. It respects ctx cancellation.
|
|
func (q *msgQueue) Enqueue(ctx context.Context, msg message.ImmutableMessage) error {
|
|
q.mu.Lock()
|
|
defer q.mu.Unlock()
|
|
|
|
for len(q.buf) >= q.cap || q.bufBytes >= q.maxSize {
|
|
if ctx.Err() != nil {
|
|
return context.Canceled
|
|
}
|
|
q.waitWithContext(ctx, q.notFull)
|
|
if ctx.Err() != nil {
|
|
return context.Canceled
|
|
}
|
|
}
|
|
|
|
// Optional runtime check: enforce non-decreasing timetick
|
|
// if n := len(q.buf); n > 0 {
|
|
// if q.buf[n-1].Timetick() > msg.Timetick() {
|
|
// return merr.WrapErrParameterInvalidMsg("enqueue timetick order violation: last=%d new=%d", q.buf[n-1].Timetick(), msg.Timetick())
|
|
// }
|
|
// }
|
|
|
|
q.buf = append(q.buf, msg)
|
|
q.bufBytes += msg.EstimateSize()
|
|
|
|
// New data is available for readers.
|
|
q.notEmpty.Signal()
|
|
return nil
|
|
}
|
|
|
|
// ReadNext returns the next message at the read cursor. Does not delete it.
|
|
func (q *msgQueue) ReadNext(ctx context.Context) (message.ImmutableMessage, error) {
|
|
q.mu.Lock()
|
|
defer q.mu.Unlock()
|
|
|
|
for q.readIdx >= len(q.buf) { // no readable messages
|
|
if ctx.Err() != nil {
|
|
return nil, context.Canceled
|
|
}
|
|
q.waitWithContext(ctx, q.notEmpty)
|
|
if ctx.Err() != nil {
|
|
return nil, context.Canceled
|
|
}
|
|
}
|
|
|
|
m := q.buf[q.readIdx]
|
|
q.readIdx++ // advance read cursor only; storage remains intact
|
|
|
|
// Readers advancing may not directly free capacity, but producers may still
|
|
// be waiting due to full buffer; signal in case cleanup made space earlier.
|
|
q.notFull.Signal()
|
|
return m, nil
|
|
}
|
|
|
|
// SeekToHead resets the read cursor to the first existing element.
|
|
func (q *msgQueue) SeekToHead() {
|
|
q.mu.Lock()
|
|
q.readIdx = 0
|
|
// Let potential consumers know there's readable data (if any exists).
|
|
if len(q.buf) > 0 {
|
|
q.notEmpty.Broadcast()
|
|
}
|
|
q.mu.Unlock()
|
|
}
|
|
|
|
// CleanupConfirmedMessages permanently drops messages with Timetick <= watermark.
|
|
// This frees capacity and may move the read cursor backward proportionally to the
|
|
// number of deleted messages (but clamped at 0).
|
|
// Returns the messages that were cleaned up.
|
|
func (q *msgQueue) CleanupConfirmedMessages(lastConfirmedTimeTick uint64) []message.ImmutableMessage {
|
|
q.mu.Lock()
|
|
defer q.mu.Unlock()
|
|
|
|
if len(q.buf) == 0 {
|
|
return nil
|
|
}
|
|
|
|
// Find first index whose Timetick() > lastConfirmedTimeTick
|
|
cut := 0
|
|
for cut < len(q.buf) && q.buf[cut].TimeTick() <= lastConfirmedTimeTick {
|
|
cut++
|
|
}
|
|
|
|
var cleanedMessages []message.ImmutableMessage
|
|
if cut > 0 {
|
|
// Collect the messages that will be cleaned up
|
|
cleanedMessages = make([]message.ImmutableMessage, cut)
|
|
copy(cleanedMessages, q.buf[:cut])
|
|
|
|
// Drop the prefix [0:cut)
|
|
// Release memory of [0:cut) by zeroing references before reslicing
|
|
for i := 0; i < cut; i++ {
|
|
q.bufBytes -= q.buf[i].EstimateSize()
|
|
q.buf[i] = nil
|
|
}
|
|
q.buf = q.buf[cut:]
|
|
// Adjust read cursor relative to the new slice
|
|
q.readIdx -= cut
|
|
if q.readIdx < 0 {
|
|
q.readIdx = 0
|
|
}
|
|
// Free space became available; wake blocked producers.
|
|
q.notFull.Broadcast()
|
|
}
|
|
|
|
return cleanedMessages
|
|
}
|
|
|
|
// waitWithContext waits on cond while allowing ctx cancellation to wake it up.
|
|
// Implementation detail:
|
|
// - cond.Wait() requires holding q.mu; Wait atomically unlocks and re-locks.
|
|
// - We spawn a short-lived goroutine that Broadcasts on ctx.Done(). This is
|
|
// safe and bounded: after Wait returns, we close a local channel to let the
|
|
// goroutine exit immediately (even if ctx wasn't canceled).
|
|
func (q *msgQueue) waitWithContext(ctx context.Context, cond *sync.Cond) {
|
|
done := make(chan struct{})
|
|
go func() {
|
|
select {
|
|
case <-ctx.Done():
|
|
q.mu.Lock()
|
|
cond.Broadcast()
|
|
q.mu.Unlock()
|
|
case <-done:
|
|
}
|
|
}()
|
|
cond.Wait() // releases q.mu while waiting; re-locks before returning
|
|
close(done)
|
|
}
|