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>
706 lines
23 KiB
Go
706 lines
23 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 (
|
|
"context"
|
|
"testing"
|
|
|
|
"github.com/bytedance/mockey"
|
|
"github.com/cockroachdb/errors"
|
|
"github.com/stretchr/testify/mock"
|
|
"github.com/stretchr/testify/suite"
|
|
|
|
"github.com/milvus-io/milvus-proto/go-api/v3/commonpb"
|
|
"github.com/milvus-io/milvus-proto/go-api/v3/milvuspb"
|
|
"github.com/milvus-io/milvus-proto/go-api/v3/schemapb"
|
|
"github.com/milvus-io/milvus/internal/datacoord/allocator"
|
|
"github.com/milvus-io/milvus/internal/datacoord/broker"
|
|
"github.com/milvus-io/milvus/internal/metastore/mocks"
|
|
"github.com/milvus-io/milvus/internal/streamingcoord/server/balancer"
|
|
"github.com/milvus-io/milvus/internal/streamingcoord/server/balancer/balance"
|
|
"github.com/milvus-io/milvus/internal/streamingcoord/server/balancer/channel"
|
|
"github.com/milvus-io/milvus/internal/streamingcoord/server/broadcaster"
|
|
"github.com/milvus-io/milvus/internal/streamingcoord/server/broadcaster/broadcast"
|
|
"github.com/milvus-io/milvus/pkg/v3/proto/datapb"
|
|
"github.com/milvus-io/milvus/pkg/v3/proto/internalpb"
|
|
"github.com/milvus-io/milvus/pkg/v3/streaming/util/message"
|
|
"github.com/milvus-io/milvus/pkg/v3/util/merr"
|
|
)
|
|
|
|
// ================================
|
|
// Import Services Test Suite
|
|
// ================================
|
|
|
|
type ImportServicesSuite struct {
|
|
suite.Suite
|
|
}
|
|
|
|
func TestImportServicesSuite(t *testing.T) {
|
|
suite.Run(t, new(ImportServicesSuite))
|
|
}
|
|
|
|
// --------------------------------
|
|
// ImportV2 Tests
|
|
// --------------------------------
|
|
|
|
func (s *ImportServicesSuite) TestImportV2_ServerNotHealthyReturnsError() {
|
|
ctx := context.Background()
|
|
server := &Server{}
|
|
server.stateCode.Store(commonpb.StateCode_Initializing)
|
|
|
|
resp, err := server.ImportV2(ctx, nil)
|
|
|
|
s.NoError(err)
|
|
s.NotNil(resp)
|
|
s.True(errors.Is(merr.Error(resp.GetStatus()), merr.ErrServiceNotReady))
|
|
}
|
|
|
|
func (s *ImportServicesSuite) TestImportV2_InvalidTimeoutReturnsError() {
|
|
ctx := context.Background()
|
|
server := &Server{}
|
|
server.stateCode.Store(commonpb.StateCode_Healthy)
|
|
|
|
req := &internalpb.ImportRequestInternal{
|
|
Options: []*commonpb.KeyValuePair{
|
|
{Key: "timeout", Value: "invalid_format"},
|
|
},
|
|
}
|
|
|
|
resp, err := server.ImportV2(ctx, req)
|
|
|
|
s.NoError(err)
|
|
s.NotNil(resp)
|
|
s.True(errors.Is(merr.Error(resp.GetStatus()), merr.ErrImportFailed))
|
|
}
|
|
|
|
func (s *ImportServicesSuite) TestImportV2_AllocatorNilReturnsError() {
|
|
ctx := context.Background()
|
|
server := &Server{}
|
|
server.stateCode.Store(commonpb.StateCode_Healthy)
|
|
server.allocator = nil
|
|
|
|
req := &internalpb.ImportRequestInternal{
|
|
Options: []*commonpb.KeyValuePair{
|
|
{Key: "timeout", Value: "300s"},
|
|
},
|
|
}
|
|
|
|
resp, err := server.ImportV2(ctx, req)
|
|
|
|
s.NoError(err)
|
|
s.NotNil(resp)
|
|
s.True(errors.Is(merr.Error(resp.GetStatus()), merr.ErrServiceUnavailable))
|
|
s.Contains(resp.GetStatus().GetReason(), "allocator not initialized")
|
|
}
|
|
|
|
func (s *ImportServicesSuite) TestImportV2_AllocatorFailsReturnsError() {
|
|
ctx := context.Background()
|
|
server := &Server{}
|
|
server.stateCode.Store(commonpb.StateCode_Healthy)
|
|
|
|
mockAllocator := allocator.NewMockAllocator(s.T())
|
|
mockAllocator.EXPECT().AllocN(mock.Anything).Return(int64(0), int64(0), merr.WrapErrServiceUnavailable("allocation failed"))
|
|
server.allocator = mockAllocator
|
|
|
|
req := &internalpb.ImportRequestInternal{
|
|
Options: []*commonpb.KeyValuePair{
|
|
{Key: "timeout", Value: "300s"},
|
|
},
|
|
}
|
|
|
|
resp, err := server.ImportV2(ctx, req)
|
|
|
|
s.NoError(err)
|
|
s.NotNil(resp)
|
|
s.True(errors.Is(merr.Error(resp.GetStatus()), merr.ErrServiceUnavailable))
|
|
s.Contains(resp.GetStatus().GetReason(), "failed to allocate job ID")
|
|
}
|
|
|
|
func (s *ImportServicesSuite) TestImportV2_BroadcastFailsReturnsError() {
|
|
ctx := context.Background()
|
|
|
|
// Mock validation to pass but broadcast to fail
|
|
mockCount := mockey.Mock((*importMeta).CountJobBy).To(func(_ *importMeta, _ context.Context, _ ...ImportJobFilter) int {
|
|
return 1
|
|
}).Build()
|
|
defer mockCount.UnPatch()
|
|
|
|
mockBalancerInst := &mockBalancerImpl{}
|
|
mockBalance := mockey.Mock(balance.GetWithContext).To(func(ctx context.Context) (balancer.Balancer, error) {
|
|
return mockBalancerInst, nil
|
|
}).Build()
|
|
defer mockBalance.UnPatch()
|
|
|
|
mockAssignment := mockey.Mock((*mockBalancerImpl).GetLatestChannelAssignment).To(
|
|
func(_ *mockBalancerImpl) (*channel.WatchChannelAssignmentsCallbackParam, error) {
|
|
return &channel.WatchChannelAssignmentsCallbackParam{
|
|
ReplicateConfiguration: nil,
|
|
}, nil
|
|
}).Build()
|
|
defer mockAssignment.UnPatch()
|
|
|
|
// Mock broker.DescribeCollectionInternal (called once in startBroadcastWithCollectionID, which will fail at StartBroadcastWithResourceKeys)
|
|
mockBroker := broker.NewMockBroker(s.T())
|
|
mockBroker.EXPECT().DescribeCollectionInternal(mock.Anything, int64(100)).Return(&milvuspb.DescribeCollectionResponse{
|
|
DbName: "test_db",
|
|
CollectionName: "test_collection",
|
|
}, nil)
|
|
|
|
// Mock StartBroadcastWithResourceKeys to fail
|
|
mockBroadcast := mockey.Mock(broadcast.StartBroadcastWithResourceKeys).To(
|
|
func(ctx context.Context, keys ...message.ResourceKey) (broadcaster.BroadcastAPI, error) {
|
|
return nil, merr.WrapErrServiceUnavailable("broadcast failed")
|
|
}).Build()
|
|
defer mockBroadcast.UnPatch()
|
|
|
|
server := &Server{
|
|
importMeta: &importMeta{},
|
|
broker: mockBroker,
|
|
}
|
|
server.stateCode.Store(commonpb.StateCode_Healthy)
|
|
|
|
mockAllocator := allocator.NewMockAllocator(s.T())
|
|
mockAllocator.EXPECT().AllocN(mock.Anything).Return(int64(1000), int64(1001), nil)
|
|
server.allocator = mockAllocator
|
|
|
|
req := &internalpb.ImportRequestInternal{
|
|
CollectionID: 100,
|
|
CollectionName: "test_collection",
|
|
PartitionIDs: []int64{1},
|
|
ChannelNames: []string{"v1"},
|
|
Schema: &schemapb.CollectionSchema{
|
|
Name: "test_collection",
|
|
DbName: "test_db",
|
|
},
|
|
Files: []*internalpb.ImportFile{
|
|
{Id: 1, Paths: []string{"/test/file.json"}},
|
|
},
|
|
Options: []*commonpb.KeyValuePair{
|
|
{Key: "timeout", Value: "300s"},
|
|
},
|
|
}
|
|
|
|
resp, err := server.ImportV2(ctx, req)
|
|
|
|
s.NoError(err)
|
|
s.NotNil(resp)
|
|
s.True(errors.Is(merr.Error(resp.GetStatus()), merr.ErrServiceUnavailable))
|
|
s.Contains(resp.GetStatus().GetReason(), "broadcast")
|
|
}
|
|
|
|
func (s *ImportServicesSuite) TestImportV2_SuccessReturnsJobID() {
|
|
ctx := context.Background()
|
|
|
|
// Mock validation to pass
|
|
mockCount := mockey.Mock((*importMeta).CountJobBy).To(func(_ *importMeta, _ context.Context, _ ...ImportJobFilter) int {
|
|
return 1
|
|
}).Build()
|
|
defer mockCount.UnPatch()
|
|
|
|
mockBalancerInst := &mockBalancerImpl{}
|
|
mockBalance := mockey.Mock(balance.GetWithContext).To(func(ctx context.Context) (balancer.Balancer, error) {
|
|
return mockBalancerInst, nil
|
|
}).Build()
|
|
defer mockBalance.UnPatch()
|
|
|
|
mockAssignment := mockey.Mock((*mockBalancerImpl).GetLatestChannelAssignment).To(
|
|
func(_ *mockBalancerImpl) (*channel.WatchChannelAssignmentsCallbackParam, error) {
|
|
return &channel.WatchChannelAssignmentsCallbackParam{
|
|
ReplicateConfiguration: nil,
|
|
}, nil
|
|
}).Build()
|
|
defer mockAssignment.UnPatch()
|
|
|
|
// Mock StartBroadcastWithResourceKeys to succeed
|
|
mockBroadcastAPI := newMockBroadcastAPIImpl()
|
|
mockBroadcast := mockey.Mock(broadcast.StartBroadcastWithResourceKeys).To(
|
|
func(ctx context.Context, keys ...message.ResourceKey) (broadcaster.BroadcastAPI, error) {
|
|
return mockBroadcastAPI, nil
|
|
}).Build()
|
|
defer mockBroadcast.UnPatch()
|
|
|
|
// Mock broker: DescribeCollectionInternal is called twice
|
|
// First call in startBroadcastWithCollectionID, second call in broadcastImport
|
|
mockBroker := broker.NewMockBroker(s.T())
|
|
mockBroker.EXPECT().DescribeCollectionInternal(mock.Anything, int64(100)).Return(&milvuspb.DescribeCollectionResponse{
|
|
DbName: "test_db",
|
|
CollectionName: "test_collection",
|
|
}, nil).Times(2)
|
|
|
|
server := &Server{
|
|
importMeta: &importMeta{},
|
|
broker: mockBroker,
|
|
}
|
|
server.stateCode.Store(commonpb.StateCode_Healthy)
|
|
|
|
mockAllocator := allocator.NewMockAllocator(s.T())
|
|
mockAllocator.EXPECT().AllocN(mock.Anything).Return(int64(1000), int64(1001), nil)
|
|
server.allocator = mockAllocator
|
|
|
|
req := &internalpb.ImportRequestInternal{
|
|
CollectionID: 100,
|
|
CollectionName: "test_collection",
|
|
PartitionIDs: []int64{1},
|
|
ChannelNames: []string{"v1"},
|
|
Schema: &schemapb.CollectionSchema{
|
|
Name: "test_collection",
|
|
DbName: "test_db",
|
|
},
|
|
Files: []*internalpb.ImportFile{
|
|
{Id: 1, Paths: []string{"/test/file.json"}},
|
|
},
|
|
Options: []*commonpb.KeyValuePair{
|
|
{Key: "timeout", Value: "300s"},
|
|
},
|
|
}
|
|
|
|
resp, err := server.ImportV2(ctx, req)
|
|
|
|
s.NoError(err)
|
|
s.NotNil(resp)
|
|
s.Equal(int32(0), resp.GetStatus().GetCode())
|
|
s.Equal("1000", resp.GetJobID())
|
|
}
|
|
|
|
func (s *ImportServicesSuite) TestImportV2_UsesDefaultDbNameWhenEmpty() {
|
|
ctx := context.Background()
|
|
|
|
// Mock validation to pass
|
|
mockCount := mockey.Mock((*importMeta).CountJobBy).To(func(_ *importMeta, _ context.Context, _ ...ImportJobFilter) int {
|
|
return 1
|
|
}).Build()
|
|
defer mockCount.UnPatch()
|
|
|
|
mockBalancerInst := &mockBalancerImpl{}
|
|
mockBalance := mockey.Mock(balance.GetWithContext).To(func(ctx context.Context) (balancer.Balancer, error) {
|
|
return mockBalancerInst, nil
|
|
}).Build()
|
|
defer mockBalance.UnPatch()
|
|
|
|
mockAssignment := mockey.Mock((*mockBalancerImpl).GetLatestChannelAssignment).To(
|
|
func(_ *mockBalancerImpl) (*channel.WatchChannelAssignmentsCallbackParam, error) {
|
|
return &channel.WatchChannelAssignmentsCallbackParam{
|
|
ReplicateConfiguration: nil,
|
|
}, nil
|
|
}).Build()
|
|
defer mockAssignment.UnPatch()
|
|
|
|
// Capture the dbName passed to broadcastImport
|
|
var capturedDbName string
|
|
mockBroadcast := mockey.Mock(broadcast.StartBroadcastWithResourceKeys).To(
|
|
func(ctx context.Context, keys ...message.ResourceKey) (broadcaster.BroadcastAPI, error) {
|
|
// Check if default db name resource key is used
|
|
for _, key := range keys {
|
|
if key.String() != "" {
|
|
capturedDbName = "default" // This indicates default db was used
|
|
}
|
|
}
|
|
return nil, errors.New("stop here for test")
|
|
}).Build()
|
|
defer mockBroadcast.UnPatch()
|
|
|
|
// Mock broker.DescribeCollectionInternal to return empty dbName (called in startBroadcastWithCollectionID)
|
|
mockBroker := broker.NewMockBroker(s.T())
|
|
mockBroker.EXPECT().DescribeCollectionInternal(mock.Anything, int64(100)).Return(&milvuspb.DescribeCollectionResponse{
|
|
DbName: "", // Empty - should use default
|
|
CollectionName: "test_collection",
|
|
}, nil)
|
|
|
|
server := &Server{
|
|
importMeta: &importMeta{},
|
|
broker: mockBroker,
|
|
}
|
|
server.stateCode.Store(commonpb.StateCode_Healthy)
|
|
|
|
mockAllocator := allocator.NewMockAllocator(s.T())
|
|
mockAllocator.EXPECT().AllocN(mock.Anything).Return(int64(1000), int64(1001), nil)
|
|
server.allocator = mockAllocator
|
|
|
|
// Request with empty DbName in schema (not used anymore, broker is the source of truth)
|
|
req := &internalpb.ImportRequestInternal{
|
|
CollectionID: 100,
|
|
CollectionName: "test_collection",
|
|
PartitionIDs: []int64{1},
|
|
ChannelNames: []string{"v1"},
|
|
Schema: &schemapb.CollectionSchema{
|
|
Name: "test_collection",
|
|
DbName: "", // Empty - not used anymore
|
|
},
|
|
Files: []*internalpb.ImportFile{
|
|
{Id: 1, Paths: []string{"/test/file.json"}},
|
|
},
|
|
Options: []*commonpb.KeyValuePair{
|
|
{Key: "timeout", Value: "300s"},
|
|
},
|
|
}
|
|
|
|
server.ImportV2(ctx, req)
|
|
|
|
// Verify that default db name was used (test stops at broadcast mock)
|
|
s.Equal("default", capturedDbName)
|
|
}
|
|
|
|
// --------------------------------
|
|
// createImportJobFromAck Tests
|
|
// --------------------------------
|
|
|
|
func (s *ImportServicesSuite) TestCreateImportJobFromAck_ServerNotHealthyReturnsError() {
|
|
ctx := context.Background()
|
|
server := &Server{}
|
|
server.stateCode.Store(commonpb.StateCode_Initializing)
|
|
|
|
resp, err := server.createImportJobFromAck(ctx, nil)
|
|
|
|
s.NoError(err)
|
|
s.NotNil(resp)
|
|
s.True(errors.Is(merr.Error(resp.GetStatus()), merr.ErrServiceNotReady))
|
|
}
|
|
|
|
func (s *ImportServicesSuite) TestCreateImportJobFromAck_InvalidTimeoutReturnsError() {
|
|
ctx := context.Background()
|
|
server := &Server{}
|
|
server.stateCode.Store(commonpb.StateCode_Healthy)
|
|
|
|
req := &internalpb.ImportRequestInternal{
|
|
Options: []*commonpb.KeyValuePair{
|
|
{Key: "timeout", Value: "invalid_format"},
|
|
},
|
|
}
|
|
|
|
resp, err := server.createImportJobFromAck(ctx, req)
|
|
|
|
s.NoError(err)
|
|
s.NotNil(resp)
|
|
s.True(errors.Is(merr.Error(resp.GetStatus()), merr.ErrImportFailed))
|
|
}
|
|
|
|
func (s *ImportServicesSuite) TestCreateImportJobFromAck_AllocatorFailsReturnsError() {
|
|
ctx := context.Background()
|
|
server := &Server{}
|
|
server.stateCode.Store(commonpb.StateCode_Healthy)
|
|
|
|
mockAllocator := allocator.NewMockAllocator(s.T())
|
|
mockAllocator.EXPECT().AllocN(mock.Anything).Return(int64(0), int64(0), merr.WrapErrServiceUnavailable("allocation failed"))
|
|
server.allocator = mockAllocator
|
|
|
|
req := &internalpb.ImportRequestInternal{
|
|
CollectionID: 100,
|
|
Files: []*internalpb.ImportFile{
|
|
{Id: 1, Paths: []string{"/test/file.json"}},
|
|
},
|
|
Options: []*commonpb.KeyValuePair{
|
|
{Key: "timeout", Value: "300s"},
|
|
},
|
|
}
|
|
|
|
resp, err := server.createImportJobFromAck(ctx, req)
|
|
|
|
s.NoError(err)
|
|
s.NotNil(resp)
|
|
s.True(errors.Is(merr.Error(resp.GetStatus()), merr.ErrServiceUnavailable))
|
|
s.Contains(resp.GetStatus().GetReason(), "alloc id failed")
|
|
}
|
|
|
|
func (s *ImportServicesSuite) TestCreateImportJobFromAck_CollectionNotFoundReturnsError() {
|
|
ctx := context.Background()
|
|
|
|
mockHandler := NewNMockHandler(s.T())
|
|
mockHandler.EXPECT().GetCollection(mock.Anything, mock.Anything).Return(nil, merr.ErrCollectionNotFound)
|
|
|
|
server := &Server{
|
|
handler: mockHandler,
|
|
}
|
|
server.stateCode.Store(commonpb.StateCode_Healthy)
|
|
|
|
mockAllocator := allocator.NewMockAllocator(s.T())
|
|
mockAllocator.EXPECT().AllocN(mock.Anything).Return(int64(1000), int64(1002), nil)
|
|
server.allocator = mockAllocator
|
|
|
|
req := &internalpb.ImportRequestInternal{
|
|
CollectionID: 100,
|
|
Files: []*internalpb.ImportFile{
|
|
{Id: 1, Paths: []string{"/test/file.json"}},
|
|
},
|
|
Options: []*commonpb.KeyValuePair{
|
|
{Key: "timeout", Value: "300s"},
|
|
},
|
|
}
|
|
|
|
resp, err := server.createImportJobFromAck(ctx, req)
|
|
|
|
s.NoError(err)
|
|
s.NotNil(resp)
|
|
s.True(errors.Is(merr.Error(resp.GetStatus()), merr.ErrCollectionNotFound))
|
|
}
|
|
|
|
func (s *ImportServicesSuite) TestCreateImportJobFromAck_CollectionNilReturnsError() {
|
|
ctx := context.Background()
|
|
|
|
mockHandler := NewNMockHandler(s.T())
|
|
mockHandler.EXPECT().GetCollection(mock.Anything, mock.Anything).Return(nil, nil)
|
|
|
|
server := &Server{
|
|
handler: mockHandler,
|
|
}
|
|
server.stateCode.Store(commonpb.StateCode_Healthy)
|
|
|
|
mockAllocator := allocator.NewMockAllocator(s.T())
|
|
mockAllocator.EXPECT().AllocN(mock.Anything).Return(int64(1000), int64(1002), nil)
|
|
server.allocator = mockAllocator
|
|
|
|
req := &internalpb.ImportRequestInternal{
|
|
CollectionID: 100,
|
|
Files: []*internalpb.ImportFile{
|
|
{Id: 1, Paths: []string{"/test/file.json"}},
|
|
},
|
|
Options: []*commonpb.KeyValuePair{
|
|
{Key: "timeout", Value: "300s"},
|
|
},
|
|
}
|
|
|
|
resp, err := server.createImportJobFromAck(ctx, req)
|
|
|
|
s.NoError(err)
|
|
s.NotNil(resp)
|
|
s.True(errors.Is(merr.Error(resp.GetStatus()), merr.ErrCollectionNotFound))
|
|
}
|
|
|
|
func (s *ImportServicesSuite) TestCreateImportJobFromAck_AddJobFailsReturnsError() {
|
|
ctx := context.Background()
|
|
|
|
mockHandler := NewNMockHandler(s.T())
|
|
mockHandler.EXPECT().GetCollection(mock.Anything, mock.Anything).Return(&collectionInfo{
|
|
ID: 100,
|
|
VChannelNames: []string{"v1"},
|
|
}, nil)
|
|
|
|
catalog := mocks.NewDataCoordCatalog(s.T())
|
|
catalog.EXPECT().ListImportJobs(mock.Anything).Return(nil, nil)
|
|
catalog.EXPECT().ListPreImportTasks(mock.Anything).Return(nil, nil)
|
|
catalog.EXPECT().ListImportTasks(mock.Anything).Return(nil, nil)
|
|
catalog.EXPECT().SaveImportJob(mock.Anything, mock.Anything).Return(merr.WrapErrServiceUnavailable("save job failed"))
|
|
|
|
importMeta, err := NewImportMeta(context.TODO(), catalog, nil, nil)
|
|
s.NoError(err)
|
|
|
|
server := &Server{
|
|
handler: mockHandler,
|
|
importMeta: importMeta,
|
|
}
|
|
server.stateCode.Store(commonpb.StateCode_Healthy)
|
|
|
|
mockAllocator := allocator.NewMockAllocator(s.T())
|
|
mockAllocator.EXPECT().AllocN(mock.Anything).Return(int64(1000), int64(1002), nil)
|
|
server.allocator = mockAllocator
|
|
|
|
req := &internalpb.ImportRequestInternal{
|
|
CollectionID: 100,
|
|
CollectionName: "test_collection",
|
|
PartitionIDs: []int64{1},
|
|
ChannelNames: []string{"v1"},
|
|
Schema: &schemapb.CollectionSchema{Name: "test_collection"},
|
|
Files: []*internalpb.ImportFile{
|
|
{Id: 1, Paths: []string{"/test/file.json"}},
|
|
},
|
|
Options: []*commonpb.KeyValuePair{
|
|
{Key: "timeout", Value: "300s"},
|
|
},
|
|
DataTimestamp: 123456789,
|
|
JobID: 2000,
|
|
}
|
|
|
|
resp, err := server.createImportJobFromAck(ctx, req)
|
|
|
|
s.NoError(err)
|
|
s.NotNil(resp)
|
|
s.True(errors.Is(merr.Error(resp.GetStatus()), merr.ErrServiceUnavailable))
|
|
s.Contains(resp.GetStatus().GetReason(), "add import job failed")
|
|
}
|
|
|
|
func (s *ImportServicesSuite) TestCreateImportJobFromAck_SuccessWithProvidedJobID() {
|
|
ctx := context.Background()
|
|
|
|
mockHandler := NewNMockHandler(s.T())
|
|
mockHandler.EXPECT().GetCollection(mock.Anything, mock.Anything).Return(&collectionInfo{
|
|
ID: 100,
|
|
VChannelNames: []string{"v1"},
|
|
}, nil)
|
|
|
|
catalog := mocks.NewDataCoordCatalog(s.T())
|
|
catalog.EXPECT().ListImportJobs(mock.Anything).Return(nil, nil)
|
|
catalog.EXPECT().ListPreImportTasks(mock.Anything).Return(nil, nil)
|
|
catalog.EXPECT().ListImportTasks(mock.Anything).Return(nil, nil)
|
|
catalog.EXPECT().SaveImportJob(mock.Anything, mock.Anything).Return(nil)
|
|
|
|
importMeta, err := NewImportMeta(context.TODO(), catalog, nil, nil)
|
|
s.NoError(err)
|
|
|
|
server := &Server{
|
|
handler: mockHandler,
|
|
importMeta: importMeta,
|
|
}
|
|
server.stateCode.Store(commonpb.StateCode_Healthy)
|
|
|
|
mockAllocator := allocator.NewMockAllocator(s.T())
|
|
mockAllocator.EXPECT().AllocN(mock.Anything).Return(int64(1000), int64(1002), nil)
|
|
server.allocator = mockAllocator
|
|
|
|
req := &internalpb.ImportRequestInternal{
|
|
CollectionID: 100,
|
|
CollectionName: "test_collection",
|
|
PartitionIDs: []int64{1},
|
|
ChannelNames: []string{"v1"},
|
|
Schema: &schemapb.CollectionSchema{Name: "test_collection"},
|
|
Files: []*internalpb.ImportFile{
|
|
{Id: 1, Paths: []string{"/test/file.json"}},
|
|
},
|
|
Options: []*commonpb.KeyValuePair{
|
|
{Key: "timeout", Value: "300s"},
|
|
},
|
|
DataTimestamp: 123456789,
|
|
JobID: 2000, // Provided job ID should be used
|
|
}
|
|
|
|
resp, err := server.createImportJobFromAck(ctx, req)
|
|
|
|
s.NoError(err)
|
|
s.NotNil(resp)
|
|
s.Equal(int32(0), resp.GetStatus().GetCode())
|
|
s.Equal("2000", resp.GetJobID()) // Should use provided job ID
|
|
}
|
|
|
|
func (s *ImportServicesSuite) TestCreateImportJobFromAck_SuccessAllocatesJobIDWhenNotProvided() {
|
|
ctx := context.Background()
|
|
|
|
mockHandler := NewNMockHandler(s.T())
|
|
mockHandler.EXPECT().GetCollection(mock.Anything, mock.Anything).Return(&collectionInfo{
|
|
ID: 100,
|
|
VChannelNames: []string{"v1"},
|
|
}, nil)
|
|
|
|
catalog := mocks.NewDataCoordCatalog(s.T())
|
|
catalog.EXPECT().ListImportJobs(mock.Anything).Return(nil, nil)
|
|
catalog.EXPECT().ListPreImportTasks(mock.Anything).Return(nil, nil)
|
|
catalog.EXPECT().ListImportTasks(mock.Anything).Return(nil, nil)
|
|
catalog.EXPECT().SaveImportJob(mock.Anything, mock.Anything).Return(nil)
|
|
|
|
importMeta, err := NewImportMeta(context.TODO(), catalog, nil, nil)
|
|
s.NoError(err)
|
|
|
|
server := &Server{
|
|
handler: mockHandler,
|
|
importMeta: importMeta,
|
|
}
|
|
server.stateCode.Store(commonpb.StateCode_Healthy)
|
|
|
|
mockAllocator := allocator.NewMockAllocator(s.T())
|
|
mockAllocator.EXPECT().AllocN(mock.Anything).Return(int64(1000), int64(1002), nil)
|
|
server.allocator = mockAllocator
|
|
|
|
req := &internalpb.ImportRequestInternal{
|
|
CollectionID: 100,
|
|
CollectionName: "test_collection",
|
|
PartitionIDs: []int64{1},
|
|
ChannelNames: []string{"v1"},
|
|
Schema: &schemapb.CollectionSchema{Name: "test_collection"},
|
|
Files: []*internalpb.ImportFile{
|
|
{Id: 1, Paths: []string{"/test/file.json"}},
|
|
},
|
|
Options: []*commonpb.KeyValuePair{
|
|
{Key: "timeout", Value: "300s"},
|
|
},
|
|
DataTimestamp: 123456789,
|
|
JobID: 0, // Not provided - should use idStart (1000)
|
|
}
|
|
|
|
resp, err := server.createImportJobFromAck(ctx, req)
|
|
|
|
s.NoError(err)
|
|
s.NotNil(resp)
|
|
s.Equal(int32(0), resp.GetStatus().GetCode())
|
|
s.Equal("1000", resp.GetJobID()) // Should use allocated idStart
|
|
}
|
|
|
|
func (s *ImportServicesSuite) TestCreateImportJobFromAck_AssignsFileIDs() {
|
|
ctx := context.Background()
|
|
|
|
mockHandler := NewNMockHandler(s.T())
|
|
mockHandler.EXPECT().GetCollection(mock.Anything, mock.Anything).Return(&collectionInfo{
|
|
ID: 100,
|
|
VChannelNames: []string{"v1"},
|
|
}, nil)
|
|
|
|
var savedJob *datapb.ImportJob
|
|
catalog := mocks.NewDataCoordCatalog(s.T())
|
|
catalog.EXPECT().ListImportJobs(mock.Anything).Return(nil, nil)
|
|
catalog.EXPECT().ListPreImportTasks(mock.Anything).Return(nil, nil)
|
|
catalog.EXPECT().ListImportTasks(mock.Anything).Return(nil, nil)
|
|
catalog.EXPECT().SaveImportJob(mock.Anything, mock.Anything).RunAndReturn(func(ctx context.Context, job *datapb.ImportJob) error {
|
|
savedJob = job
|
|
return nil
|
|
})
|
|
|
|
importMeta, err := NewImportMeta(context.TODO(), catalog, nil, nil)
|
|
s.NoError(err)
|
|
|
|
server := &Server{
|
|
handler: mockHandler,
|
|
importMeta: importMeta,
|
|
}
|
|
server.stateCode.Store(commonpb.StateCode_Healthy)
|
|
|
|
mockAllocator := allocator.NewMockAllocator(s.T())
|
|
// With 3 files, AllocN(4) will be called (files + 1 for job ID)
|
|
mockAllocator.EXPECT().AllocN(mock.Anything).Return(int64(1000), int64(1004), nil)
|
|
server.allocator = mockAllocator
|
|
|
|
req := &internalpb.ImportRequestInternal{
|
|
CollectionID: 100,
|
|
CollectionName: "test_collection",
|
|
PartitionIDs: []int64{1},
|
|
ChannelNames: []string{"v1"},
|
|
Schema: &schemapb.CollectionSchema{Name: "test_collection"},
|
|
Files: []*internalpb.ImportFile{
|
|
{Id: 0, Paths: []string{"/test/file1.json"}},
|
|
{Id: 0, Paths: []string{"/test/file2.json"}},
|
|
{Id: 0, Paths: []string{"/test/file3.json"}},
|
|
},
|
|
Options: []*commonpb.KeyValuePair{
|
|
{Key: "timeout", Value: "300s"},
|
|
},
|
|
DataTimestamp: 123456789,
|
|
JobID: 2000,
|
|
}
|
|
|
|
resp, err := server.createImportJobFromAck(ctx, req)
|
|
|
|
s.NoError(err)
|
|
s.NotNil(resp)
|
|
s.Equal(int32(0), resp.GetStatus().GetCode())
|
|
|
|
// Verify file IDs were assigned correctly
|
|
s.NotNil(savedJob)
|
|
files := savedJob.GetFiles()
|
|
s.Len(files, 3)
|
|
s.Equal(int64(1001), files[0].GetId()) // idStart + 0 + 1
|
|
s.Equal(int64(1002), files[1].GetId()) // idStart + 1 + 1
|
|
s.Equal(int64(1003), files[2].GetId()) // idStart + 2 + 1
|
|
}
|
|
|
|
// Helper types are defined in import_callbacks_test.go (mockBalancerImpl, mockBroadcastAPIImpl, newMockBroadcastAPIImpl)
|