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>
328 lines
7.7 KiB
Go
328 lines
7.7 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 httpserver
|
|
|
|
import (
|
|
"bufio"
|
|
"bytes"
|
|
"context"
|
|
"fmt"
|
|
"net"
|
|
"net/http"
|
|
"strconv"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
"go.uber.org/zap"
|
|
|
|
mhttp "github.com/milvus-io/milvus/internal/http"
|
|
"github.com/milvus-io/milvus/internal/json"
|
|
"github.com/milvus-io/milvus/pkg/v3/log"
|
|
"github.com/milvus-io/milvus/pkg/v3/util/merr"
|
|
"github.com/milvus-io/milvus/pkg/v3/util/paramtable"
|
|
)
|
|
|
|
// BufferPool represents a pool of buffers.
|
|
type BufferPool struct {
|
|
pool sync.Pool
|
|
}
|
|
|
|
// Get returns a buffer from the buffer pool.
|
|
// If the pool is empty, a new buffer is created and returned.
|
|
func (p *BufferPool) Get() *bytes.Buffer {
|
|
buf := p.pool.Get()
|
|
if buf == nil {
|
|
return &bytes.Buffer{}
|
|
}
|
|
return buf.(*bytes.Buffer)
|
|
}
|
|
|
|
// Put adds a buffer back to the pool.
|
|
func (p *BufferPool) Put(buf *bytes.Buffer) {
|
|
p.pool.Put(buf)
|
|
}
|
|
|
|
// Timeout struct
|
|
type Timeout struct {
|
|
handler gin.HandlerFunc
|
|
}
|
|
|
|
const timeoutRecorderNoWritten = -1
|
|
|
|
type timeoutResponseRecorder struct {
|
|
body *bytes.Buffer
|
|
headers http.Header
|
|
mu sync.Mutex
|
|
closed bool
|
|
status int
|
|
size int
|
|
closeNotify chan bool
|
|
}
|
|
|
|
func newTimeoutResponseRecorder(buf *bytes.Buffer) *timeoutResponseRecorder {
|
|
return &timeoutResponseRecorder{
|
|
body: buf,
|
|
headers: make(http.Header),
|
|
status: http.StatusOK,
|
|
size: timeoutRecorderNoWritten,
|
|
closeNotify: make(chan bool),
|
|
}
|
|
}
|
|
|
|
func (w *timeoutResponseRecorder) Header() http.Header {
|
|
return w.headers
|
|
}
|
|
|
|
func (w *timeoutResponseRecorder) Write(data []byte) (int, error) {
|
|
w.mu.Lock()
|
|
defer w.mu.Unlock()
|
|
if w.closed || w.body == nil {
|
|
return 0, merr.WrapErrServiceInternalMsg("response writer closed")
|
|
}
|
|
if !w.written() {
|
|
w.size = 0
|
|
}
|
|
n, err := w.body.Write(data)
|
|
w.size += n
|
|
return n, err
|
|
}
|
|
|
|
func (w *timeoutResponseRecorder) WriteString(s string) (int, error) {
|
|
w.mu.Lock()
|
|
defer w.mu.Unlock()
|
|
if w.closed || w.body == nil {
|
|
return 0, merr.WrapErrServiceInternalMsg("response writer closed")
|
|
}
|
|
if !w.written() {
|
|
w.size = 0
|
|
}
|
|
n, err := w.body.WriteString(s)
|
|
w.size += n
|
|
return n, err
|
|
}
|
|
|
|
func (w *timeoutResponseRecorder) WriteHeader(code int) {
|
|
if code == -1 {
|
|
return
|
|
}
|
|
checkWriteHeaderCode(code)
|
|
|
|
w.mu.Lock()
|
|
defer w.mu.Unlock()
|
|
if w.closed || w.written() {
|
|
return
|
|
}
|
|
w.status = code
|
|
}
|
|
|
|
func (w *timeoutResponseRecorder) WriteHeaderNow() {
|
|
w.mu.Lock()
|
|
defer w.mu.Unlock()
|
|
if w.closed || w.written() {
|
|
return
|
|
}
|
|
w.size = 0
|
|
}
|
|
|
|
func (w *timeoutResponseRecorder) Status() int {
|
|
w.mu.Lock()
|
|
defer w.mu.Unlock()
|
|
return w.status
|
|
}
|
|
|
|
func (w *timeoutResponseRecorder) Size() int {
|
|
w.mu.Lock()
|
|
defer w.mu.Unlock()
|
|
return w.size
|
|
}
|
|
|
|
func (w *timeoutResponseRecorder) Written() bool {
|
|
w.mu.Lock()
|
|
defer w.mu.Unlock()
|
|
return w.written()
|
|
}
|
|
|
|
func (w *timeoutResponseRecorder) Flush() {}
|
|
|
|
func (w *timeoutResponseRecorder) Hijack() (net.Conn, *bufio.ReadWriter, error) {
|
|
return nil, nil, merr.WrapErrServiceInternalMsg("response writer does not support hijack")
|
|
}
|
|
|
|
func (w *timeoutResponseRecorder) CloseNotify() <-chan bool {
|
|
return w.closeNotify
|
|
}
|
|
|
|
func (w *timeoutResponseRecorder) Pusher() http.Pusher {
|
|
return nil
|
|
}
|
|
|
|
func (w *timeoutResponseRecorder) CommitTo(realWriter gin.ResponseWriter) error {
|
|
w.mu.Lock()
|
|
defer w.mu.Unlock()
|
|
if w.closed || w.body == nil {
|
|
return merr.WrapErrServiceInternalMsg("response writer closed")
|
|
}
|
|
|
|
dst := realWriter.Header()
|
|
for k, vv := range w.headers {
|
|
dst[k] = append([]string(nil), vv...)
|
|
}
|
|
realWriter.WriteHeader(w.status)
|
|
if w.body.Len() == 0 {
|
|
if w.written() || w.status != http.StatusOK {
|
|
realWriter.WriteHeaderNow()
|
|
}
|
|
return nil
|
|
}
|
|
_, err := realWriter.Write(w.body.Bytes())
|
|
return err
|
|
}
|
|
|
|
func (w *timeoutResponseRecorder) Close() {
|
|
w.mu.Lock()
|
|
defer w.mu.Unlock()
|
|
if w.body != nil {
|
|
w.body.Reset()
|
|
w.body = nil
|
|
}
|
|
w.closed = true
|
|
}
|
|
|
|
func (w *timeoutResponseRecorder) CloseForTimeout() {
|
|
w.Close()
|
|
}
|
|
|
|
func (w *timeoutResponseRecorder) written() bool {
|
|
return w.size != timeoutRecorderNoWritten
|
|
}
|
|
|
|
func checkWriteHeaderCode(code int) {
|
|
if code < 100 || code > 999 {
|
|
panic(fmt.Sprintf("invalid http status code: %d", code))
|
|
}
|
|
}
|
|
|
|
var timeoutContextKeysToPropagate = []string{
|
|
HTTPReturnCode,
|
|
HTTPReturnMessage,
|
|
ContextRequest,
|
|
ContextResponse,
|
|
"traceID",
|
|
}
|
|
|
|
func propagateTimeoutContextKeys(dst *gin.Context, src *gin.Context) {
|
|
for _, key := range timeoutContextKeysToPropagate {
|
|
if value, ok := src.Get(key); ok {
|
|
dst.Set(key, value)
|
|
}
|
|
}
|
|
}
|
|
|
|
func timeoutMiddleware(handler gin.HandlerFunc) gin.HandlerFunc {
|
|
timeoutHandler := &Timeout{
|
|
handler: handler,
|
|
}
|
|
bufPool := &BufferPool{}
|
|
return func(gCtx *gin.Context) {
|
|
timeout := paramtable.Get().HTTPCfg.RequestTimeoutMs.GetAsDuration(time.Millisecond)
|
|
requestTimeout := gCtx.Request.Header.Get(mhttp.HTTPHeaderRequestTimeout)
|
|
if requestTimeout != "" {
|
|
timeoutSecond, err := strconv.ParseInt(requestTimeout, 10, 64)
|
|
if err != nil {
|
|
HTTPAbortReturn(gCtx, http.StatusOK, gin.H{
|
|
mhttp.HTTPReturnCode: merr.Code(merr.ErrParameterInvalid),
|
|
mhttp.HTTPReturnMessage: merr.WrapErrParameterInvalidMsg(
|
|
"%s parse failed, err: %s",
|
|
mhttp.HTTPHeaderRequestTimeout,
|
|
err.Error(),
|
|
).Error(),
|
|
})
|
|
return
|
|
}
|
|
timeout = time.Duration(timeoutSecond) * time.Second
|
|
}
|
|
topCtx, cancel := context.WithTimeout(gCtx.Request.Context(), timeout)
|
|
defer cancel()
|
|
req := gCtx.Request.WithContext(topCtx)
|
|
gCtx.Request = req
|
|
|
|
finish := make(chan struct{}, 1)
|
|
panicChan := make(chan interface{}, 1)
|
|
|
|
realWriter := gCtx.Writer
|
|
buffer := bufPool.Get()
|
|
buffer.Reset()
|
|
recorder := newTimeoutResponseRecorder(buffer)
|
|
handlerCtx := gCtx.Copy()
|
|
handlerCtx.Request = req
|
|
handlerCtx.Writer = recorder
|
|
|
|
go func() {
|
|
defer func() {
|
|
if p := recover(); p != nil {
|
|
panicChan <- p
|
|
}
|
|
}()
|
|
timeoutHandler.handler(handlerCtx)
|
|
finish <- struct{}{}
|
|
}()
|
|
|
|
timer := time.NewTimer(timeout)
|
|
defer timer.Stop()
|
|
|
|
select {
|
|
case p := <-panicChan:
|
|
recorder.Close()
|
|
bufPool.Put(buffer)
|
|
gCtx.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{mhttp.HTTPReturnCode: http.StatusInternalServerError})
|
|
panic(p)
|
|
|
|
case <-finish:
|
|
propagateTimeoutContextKeys(gCtx, handlerCtx)
|
|
if handlerCtx.IsAborted() {
|
|
gCtx.Abort()
|
|
}
|
|
gCtx.Next()
|
|
if err := recorder.CommitTo(realWriter); err != nil {
|
|
log.Warn("failed to write response body", zap.Error(err))
|
|
recorder.Close()
|
|
bufPool.Put(buffer)
|
|
return
|
|
}
|
|
recorder.Close()
|
|
bufPool.Put(buffer)
|
|
|
|
case <-timer.C:
|
|
cancel()
|
|
gCtx.Abort()
|
|
gCtx.Set(HTTPReturnCode, merr.TimeoutCode)
|
|
gCtx.Set(HTTPReturnMessage, "request timeout")
|
|
recorder.CloseForTimeout()
|
|
bufPool.Put(buffer)
|
|
|
|
realWriter.Header().Set("Content-Type", "application/json; charset=utf-8")
|
|
if traceID, ok := getTraceID(gCtx); ok {
|
|
setTraceIDHeaderTo(realWriter.Header(), traceID)
|
|
}
|
|
realWriter.WriteHeader(http.StatusRequestTimeout)
|
|
body, _ := json.Marshal(gin.H{HTTPReturnCode: merr.TimeoutCode, HTTPReturnMessage: "request timeout"})
|
|
realWriter.Write(body)
|
|
}
|
|
}
|
|
}
|