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>
208 lines
5.4 KiB
Go
208 lines
5.4 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 datacoord
|
|
|
|
import (
|
|
"container/heap"
|
|
|
|
"github.com/cockroachdb/errors"
|
|
"github.com/samber/lo"
|
|
|
|
"github.com/milvus-io/milvus/pkg/v3/proto/datapb"
|
|
"github.com/milvus-io/milvus/pkg/v3/util/lock"
|
|
)
|
|
|
|
type Item[T any] struct {
|
|
value T
|
|
priority int // The priority of the item in the queue.
|
|
// The index is needed by update and is maintained by the heap.Interface methods.
|
|
index int // The index of the item in the heap.
|
|
}
|
|
|
|
// A PriorityQueue implements heap.Interface and holds Items.
|
|
type PriorityQueue[T any] []*Item[T]
|
|
|
|
var _ heap.Interface = (*PriorityQueue[any])(nil)
|
|
|
|
func (pq PriorityQueue[T]) Len() int { return len(pq) }
|
|
|
|
func (pq PriorityQueue[T]) Less(i, j int) bool {
|
|
return pq[i].priority < pq[j].priority
|
|
}
|
|
|
|
func (pq PriorityQueue[T]) Swap(i, j int) {
|
|
pq[i], pq[j] = pq[j], pq[i]
|
|
pq[i].index = i
|
|
pq[j].index = j
|
|
}
|
|
|
|
func (pq *PriorityQueue[T]) Push(x any) {
|
|
n := len(*pq)
|
|
item := x.(*Item[T])
|
|
item.index = n
|
|
*pq = append(*pq, item)
|
|
}
|
|
|
|
func (pq *PriorityQueue[T]) Pop() any {
|
|
old := *pq
|
|
n := len(old)
|
|
item := old[n-1]
|
|
old[n-1] = nil // don't stop the GC from reclaiming the item eventually
|
|
item.index = -1 // for safety
|
|
*pq = old[0 : n-1]
|
|
return item
|
|
}
|
|
|
|
// update modifies the priority and value of an Item in the queue.
|
|
func (pq *PriorityQueue[T]) Update(item *Item[T], value T, priority int) {
|
|
item.value = value
|
|
item.priority = priority
|
|
heap.Fix(pq, item.index)
|
|
}
|
|
|
|
// errFull / errNoSuchElement are INTERNAL sentinels: caught by errors.Is
|
|
// inside the compaction inspector / scheduler loop and never serialized
|
|
// across any gRPC boundary. See docs/dev/error_sentinel_convention.md.
|
|
var (
|
|
errFull = errors.New("compaction queue is full")
|
|
errNoSuchElement = errors.New("compaction queue has no element")
|
|
)
|
|
|
|
type Prioritizer func(t CompactionTask) int
|
|
|
|
type CompactionQueue struct {
|
|
pq PriorityQueue[CompactionTask]
|
|
lock lock.RWMutex
|
|
prioritizer Prioritizer
|
|
capacity int
|
|
}
|
|
|
|
func NewCompactionQueue(capacity int, prioritizer Prioritizer) *CompactionQueue {
|
|
return &CompactionQueue{
|
|
pq: make(PriorityQueue[CompactionTask], 0),
|
|
lock: lock.RWMutex{},
|
|
prioritizer: prioritizer,
|
|
capacity: capacity,
|
|
}
|
|
}
|
|
|
|
func (q *CompactionQueue) Enqueue(t CompactionTask) error {
|
|
q.lock.Lock()
|
|
defer q.lock.Unlock()
|
|
if q.capacity > 0 && len(q.pq) >= q.capacity {
|
|
return errFull
|
|
}
|
|
|
|
heap.Push(&q.pq, &Item[CompactionTask]{value: t, priority: q.prioritizer(t)})
|
|
return nil
|
|
}
|
|
|
|
func (q *CompactionQueue) Dequeue() (CompactionTask, error) {
|
|
q.lock.Lock()
|
|
defer q.lock.Unlock()
|
|
|
|
if len(q.pq) == 0 {
|
|
return nil, errNoSuchElement
|
|
}
|
|
|
|
item := heap.Pop(&q.pq).(*Item[CompactionTask])
|
|
return item.value, nil
|
|
}
|
|
|
|
func (q *CompactionQueue) UpdatePrioritizer(prioritizer Prioritizer) {
|
|
q.prioritizer = prioritizer
|
|
q.lock.Lock()
|
|
defer q.lock.Unlock()
|
|
for i := range q.pq {
|
|
q.pq[i].priority = q.prioritizer(q.pq[i].value)
|
|
}
|
|
heap.Init(&q.pq)
|
|
}
|
|
|
|
func (q *CompactionQueue) RemoveAll(predicate func(CompactionTask) bool) {
|
|
q.lock.Lock()
|
|
defer q.lock.Unlock()
|
|
f := lo.Filter[*Item[CompactionTask]](q.pq, func(i1 *Item[CompactionTask], _ int) bool {
|
|
return !predicate(i1.value)
|
|
})
|
|
q.pq = f
|
|
heap.Init(&q.pq)
|
|
}
|
|
|
|
// ForEach calls f on each item in the queue.
|
|
func (q *CompactionQueue) ForEach(f func(CompactionTask)) {
|
|
q.lock.RLock()
|
|
defer q.lock.RUnlock()
|
|
lo.ForEach[*Item[CompactionTask]](q.pq, func(i *Item[CompactionTask], _ int) {
|
|
f(i.value)
|
|
})
|
|
}
|
|
|
|
func (q *CompactionQueue) Len() int {
|
|
q.lock.RLock()
|
|
defer q.lock.RUnlock()
|
|
return len(q.pq)
|
|
}
|
|
|
|
var (
|
|
DefaultPrioritizer Prioritizer = func(task CompactionTask) int {
|
|
return int(task.GetTaskProto().GetPlanID())
|
|
}
|
|
|
|
LevelPrioritizer Prioritizer = func(task CompactionTask) int {
|
|
switch task.GetTaskProto().GetType() {
|
|
case datapb.CompactionType_Level0DeleteCompaction:
|
|
return 1
|
|
case datapb.CompactionType_MixCompaction:
|
|
return 10
|
|
case datapb.CompactionType_BumpSchemaVersionCompaction:
|
|
return 10
|
|
case datapb.CompactionType_ClusteringCompaction:
|
|
return 100
|
|
default:
|
|
return 1000
|
|
}
|
|
}
|
|
|
|
MixFirstPrioritizer Prioritizer = func(task CompactionTask) int {
|
|
switch task.GetTaskProto().GetType() {
|
|
case datapb.CompactionType_Level0DeleteCompaction:
|
|
return 10
|
|
case datapb.CompactionType_MixCompaction:
|
|
return 1
|
|
case datapb.CompactionType_BumpSchemaVersionCompaction:
|
|
return 1
|
|
case datapb.CompactionType_ClusteringCompaction:
|
|
return 100
|
|
default:
|
|
return 1000
|
|
}
|
|
}
|
|
)
|
|
|
|
func getPrioritizer() Prioritizer {
|
|
p := Params.DataCoordCfg.CompactionTaskPrioritizer.GetValue()
|
|
switch p {
|
|
case "level":
|
|
return LevelPrioritizer
|
|
case "mix":
|
|
return MixFirstPrioritizer
|
|
default:
|
|
return DefaultPrioritizer
|
|
}
|
|
}
|