mirror of
https://github.com/milvus-io/milvus.git
synced 2026-07-21 10:15:43 +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>
218 lines
8.5 KiB
Go
218 lines
8.5 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 (
|
|
"path"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/milvus-io/milvus/internal/storage"
|
|
"github.com/milvus-io/milvus/pkg/v3/proto/datapb"
|
|
"github.com/milvus-io/milvus/pkg/v3/util/merr"
|
|
)
|
|
|
|
// BackfillResult is the decoded form of the JSON produced by the Spark
|
|
// backfill job. Only fields required for commit are modeled; other diagnostic
|
|
// fields (executionTimeMs, usedSourceByField, etc.) are ignored.
|
|
//
|
|
// Reference: spark-milvus/docs/backfill-result-json-format.md
|
|
type BackfillResult struct {
|
|
Success bool `json:"success"`
|
|
CollectionID int64 `json:"collectionId"`
|
|
PartitionID int64 `json:"partitionId"`
|
|
NewFieldNames []string `json:"newFieldNames"`
|
|
Segments map[string]BackfillSegment `json:"segments"` // key = segmentID as decimal string
|
|
}
|
|
|
|
// BackfillSegment is one entry in BackfillResult.Segments.
|
|
//
|
|
// V3 entries carry {version, manifestPaths} and omit storage_version/column_groups.
|
|
// V2 entries carry {storage_version: 2, column_groups: [...]} and have version == -1.
|
|
type BackfillSegment struct {
|
|
Version int64 `json:"version"` // V3: committedVersion (>0); V2: -1
|
|
RowCount int64 `json:"rowCount"`
|
|
OutputPath string `json:"outputPath"`
|
|
ManifestPaths []string `json:"manifestPaths"`
|
|
StorageVersion *int64 `json:"storage_version,omitempty"` // ptr to distinguish absent vs 0
|
|
ColumnGroups []BackfillV2ColumnGroup `json:"column_groups,omitempty"`
|
|
}
|
|
|
|
// BackfillV2ColumnGroup describes one V2 column group produced by backfill.
|
|
// Invariant from backfill: field_ids has exactly one element (single-field groups).
|
|
type BackfillV2ColumnGroup struct {
|
|
FieldIDs []int64 `json:"field_ids"`
|
|
BinlogFiles []string `json:"binlog_files"` // ascending by log_id
|
|
RowCount int64 `json:"row_count"` // group-level; trusted as segment NumOfRows
|
|
}
|
|
|
|
// IsV2 reports whether this entry represents a StorageV2 segment.
|
|
func (s *BackfillSegment) IsV2() bool {
|
|
return s.StorageVersion != nil && *s.StorageVersion == storage.StorageV2 && len(s.ColumnGroups) > 0
|
|
}
|
|
|
|
// knownObjectSchemes lists URI schemes recognized by normalizeObjectKey.
|
|
// All map to "treat host as bucket, path as object key".
|
|
var knownObjectSchemes = map[string]struct{}{
|
|
"s3": {},
|
|
"s3a": {},
|
|
"s3n": {},
|
|
"gs": {},
|
|
"oss": {},
|
|
"minio": {},
|
|
}
|
|
|
|
// normalizeObjectKey converts a spark-style URI into a chunk-manager object key.
|
|
//
|
|
// Rules:
|
|
// 1. No scheme -> trim leading '/', return as-is.
|
|
// 2. Known scheme -> parse "<scheme>://<host>/<path>"; if expectedBucket != "" and
|
|
// host != expectedBucket, return ErrBucketMismatch. Otherwise return <path>.
|
|
// 3. Unknown scheme -> return ErrUnsupportedScheme.
|
|
func normalizeObjectKey(raw, expectedBucket string) (string, error) {
|
|
if raw == "" {
|
|
return "", merr.WrapErrServiceInternalMsg("empty object path")
|
|
}
|
|
if !strings.Contains(raw, "://") {
|
|
key := strings.TrimPrefix(raw, "/")
|
|
if key == "" {
|
|
return "", merr.WrapErrServiceInternalMsg("empty object key in %q", raw)
|
|
}
|
|
return key, nil
|
|
}
|
|
idx := strings.Index(raw, "://")
|
|
scheme := strings.ToLower(raw[:idx])
|
|
if _, ok := knownObjectSchemes[scheme]; !ok {
|
|
return "", merr.WrapErrServiceInternalMsg("unsupported object URI scheme %q in %q", scheme, raw)
|
|
}
|
|
rest := raw[idx+3:]
|
|
slash := strings.Index(rest, "/")
|
|
if slash < 0 {
|
|
return "", merr.WrapErrServiceInternalMsg("malformed object URI %q: missing object key", raw)
|
|
}
|
|
bucket := rest[:slash]
|
|
key := rest[slash+1:]
|
|
if expectedBucket != "" && bucket != expectedBucket {
|
|
return "", merr.WrapErrServiceInternalMsg("object URI bucket %q differs from datacoord bucket %q (path=%s)", bucket, expectedBucket, raw)
|
|
}
|
|
// Reject inputs like "s3a://bucket/" that parse to an empty key -- passing
|
|
// an empty key to chunkManager.Read has undefined behavior across SDKs.
|
|
if key == "" {
|
|
return "", merr.WrapErrServiceInternalMsg("empty object key in %q", raw)
|
|
}
|
|
return key, nil
|
|
}
|
|
|
|
// parseLogIDFromKey extracts the trailing path segment as int64. Returns 0 with
|
|
// ok=false if the trailing segment is not a decimal integer (e.g. when it has a
|
|
// file extension). Callers should proceed even on ok=false -- LogID is
|
|
// informational for this particular flow.
|
|
func parseLogIDFromKey(key string) (int64, bool) {
|
|
base := path.Base(key)
|
|
if base == "" || base == "." || base == "/" {
|
|
return 0, false
|
|
}
|
|
id, err := strconv.ParseInt(base, 10, 64)
|
|
if err != nil {
|
|
return 0, false
|
|
}
|
|
return id, true
|
|
}
|
|
|
|
// buildV2Groups constructs the datapb.FieldBinlog map used by the V2 update
|
|
// operator. EntriesNum is distributed across BinlogFiles by integer division
|
|
// (remainder added to the last file) -- the sum equals g.RowCount, which the
|
|
// backfill contract guarantees to equal segment.NumOfRows.
|
|
//
|
|
// This function does NOT read parquet footers. It trusts the row counts in the
|
|
// result JSON per the backfill contract (see
|
|
// spark-milvus/docs/backfill-result-json-format.md).
|
|
func buildV2Groups(bucket string, entry *BackfillSegment) (map[int64]*datapb.FieldBinlog, error) {
|
|
out := make(map[int64]*datapb.FieldBinlog, len(entry.ColumnGroups))
|
|
for i := range entry.ColumnGroups {
|
|
g := &entry.ColumnGroups[i]
|
|
if len(g.FieldIDs) != 1 {
|
|
return nil, merr.WrapErrServiceInternalMsg("backfill invariant violated: column group has %d field_ids (expected 1)", len(g.FieldIDs))
|
|
}
|
|
n := int64(len(g.BinlogFiles))
|
|
if n == 0 {
|
|
return nil, merr.WrapErrServiceInternalMsg("column group for field %d has no binlog files", g.FieldIDs[0])
|
|
}
|
|
fid := g.FieldIDs[0]
|
|
if _, dup := out[fid]; dup {
|
|
return nil, merr.WrapErrServiceInternalMsg("duplicate column group for field %d", fid)
|
|
}
|
|
// row_count flows into EntriesNum; non-positive values are undefined
|
|
// (zero collapses presence markers, negatives break accounting).
|
|
if g.RowCount <= 0 {
|
|
return nil, merr.WrapErrServiceInternalMsg("column group for field %d has non-positive row_count %d", fid, g.RowCount)
|
|
}
|
|
avg := g.RowCount / n
|
|
rem := g.RowCount - avg*n
|
|
binlogs := make([]*datapb.Binlog, 0, n)
|
|
for idx, p := range g.BinlogFiles {
|
|
key, err := normalizeObjectKey(p, bucket)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
rows := avg
|
|
if int64(idx) == n-1 {
|
|
rows += rem
|
|
}
|
|
logID, ok := parseLogIDFromKey(key)
|
|
if !ok {
|
|
return nil, merr.WrapErrServiceInternalMsg("column group for field %d has binlog file %q with non-numeric trailing segment", fid, p)
|
|
}
|
|
// LogPath must be empty at persistence time -- catalog.checkLogID
|
|
// rejects any Binlog with LogPath != "" (see
|
|
// internal/metastore/kv/datacoord/util.go). Canonical on-disk
|
|
// form is {LogID, LogPath:""}; DecompressBinLog reconstructs the
|
|
// path from LogID + (collection, partition, segment, field) at
|
|
// load time.
|
|
binlogs = append(binlogs, &datapb.Binlog{
|
|
EntriesNum: rows,
|
|
LogID: logID,
|
|
})
|
|
}
|
|
out[fid] = &datapb.FieldBinlog{
|
|
FieldID: fid,
|
|
// ChildFields carries the real field IDs that index creation
|
|
// (getSegmentBinlogFields) and backfill-compaction detection
|
|
// (getMissingFunctions) rely on. Without it the new group is
|
|
// invisible to both paths; it also lets the operator's strip
|
|
// logic reference-count the field out of the old groups.
|
|
// The backfill invariant guarantees len(g.FieldIDs) == 1.
|
|
ChildFields: []int64{fid},
|
|
Binlogs: binlogs,
|
|
}
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
// bucketFromChunkManager returns the bucket name of the given chunk manager if
|
|
// it exposes BucketName(); otherwise returns an empty string (bucket check will
|
|
// be skipped). Used to avoid a hard dependency on *RemoteChunkManager.
|
|
func bucketFromChunkManager(cm storage.ChunkManager) string {
|
|
type bucketNameProvider interface {
|
|
BucketName() string
|
|
}
|
|
if p, ok := cm.(bucketNameProvider); ok {
|
|
return p.BucketName()
|
|
}
|
|
return ""
|
|
}
|