mirror of
https://github.com/milvus-io/milvus.git
synced 2026-07-21 10:15:43 +00:00
issue: #50145 ## Summary Make `mixCompactionTask` build text indexes inline for `enable_match` fields (mirroring `sortCompactionTask`) so that mix-compaction output segments arrive at QueryNode already carrying `TextStatsLogs`. This eliminates the CGO_LOAD `CreateTextIndex` fallback path in segcore — observed in production to redundantly rebuild text indexes during segment load for tens of seconds up to 13+ minutes per segment. ## Background For a freshly mix-compacted segment with text-match fields, the load pipeline currently races: 1. Vector index task completes within ~10s (event-triggered) 2. QueryCoord treats the segment as loadable once the vector index is ready 3. The `TextIndexJob` (stats task) is event-less — only the 60s polling ticker submits it 4. The job itself takes ~2 minutes for typical text-heavy segments 5. QueryNode receives the segment before its persistent text index is written; segcore detects `text_stats_logs == nil` and calls `CreateTextIndex` in-place at load time (`[CGO_LOAD]` scope) `sortCompactionTask` already avoids this by building the text index inline as part of compaction (`internal/datanode/compactor/sort_compaction.go:469-503`). `mixCompactionTask` did not — this PR closes the gap. ## What changes - **`internal/datanode/compactor/mix_compactor.go`** — Add `cm storage.ChunkManager` field; constructor takes one extra arg; add a thin `createTextIndex` method wrapper that delegates to the existing package-level `createTextIndex` helper (in `compactor_common.go`, already used by sort compaction); after `applyLOBCompaction`, loop over each non-empty **sorted** output segment, build text indexes, update the V3 manifest, and assign `TextStatsLogs`. Emits a `create_text_index` stage latency metric. (No new shared helper is introduced — this PR reuses `compactor_common.go:createTextIndex` and `sort_compaction.go` is untouched.) - **`internal/datanode/compactor/namespace_compactor.go`** — Forward `cm` to the inner `mixCompactionTask`. - **`internal/datanode/services.go`** — Updated call sites (pass `cm`). - **`internal/datacoord/compaction_task_mix.go`** — Extend the `FileResources` plumbing condition to include `MixCompaction` so custom analyzers (ref mode) reach the inline build. Previously only `SortCompaction` got `FileResources`, which would have caused mix-compacted text indexes to use default tokenization → silent search regressions. - **`internal/datacoord/compaction_task_clustering.go` / `compaction_inspector.go`** — Namespace-enabled `ClusteringCompaction` is routed on the DataNode to `NewNamespaceCompactor`, which delegates to `mixCompactionTask.Compact()` and now builds the text index inline for sorted-by-namespace outputs. Wire `IndexEngineVersionManager` into `clusteringCompactionTask` and, in `BuildCompactionRequest()`, set `CurrentScalarIndexVersion` (otherwise the inline text index metadata is emitted with version 0) and fetch `FileResources` for namespace-enabled clustering plans in ref mode (otherwise the custom analyzer resources are not downloaded and the text index falls back to the default analyzer). Addresses review feedback from @aoiasd. - **`internal/datanode/compactor/mix_compactor_test.go` / `namespace_compactor_test.go`** — Updated existing constructor call sites to pass the new `cm` arg. - **`internal/datanode/compactor/mix_compactor_text_index_test.go` (new)** — Mockey-based unit tests covering: the wrapper's identifier propagation to the package helper, error propagation, and real `Compact()` inline-loop semantics (empty + unsorted segments skipped, `TextStatsLogs` assigned for sorted, V3 manifest rewritten, build/manifest errors abort). - **`internal/datacoord/compaction_task_mix_test.go`** — Test that `MixCompaction` plans receive `FileResources` in ref mode. ## Test plan - [x] `go test -tags dynamic,test -gcflags="all=-N -l" -count=1 -run "TestMixCompaction|TestNamespace|TestSort" ./internal/datanode/compactor/...` — PASS (post-rebase) - [x] `go test -tags dynamic,test -gcflags="all=-N -l" -count=1 -run "TestMixCompaction|TestCompactionTask" ./internal/datacoord/...` — PASS - [x] New unit tests pass: `TestMixCompaction_createTextIndex_Delegates`, `TestMixCompaction_createTextIndex_PropagatesError`, `TestMixCompaction_Compact_InlineTextIndex`, `TestMixCompaction_Compact_InlineTextIndex_BuildError`, `TestMixCompaction_Compact_InlineTextIndex_ManifestError`, and (datacoord) `TestMixCompactionTaskSuite/TestBuildCompactionRequest_MixFileResourcesInRefMode`, `TestClusteringCompactionTaskSuite/TestBuildCompactionRequest_NamespaceFileResourcesInRefMode` - [ ] CI builds against fresh C++ artifacts (local worktree build was skipped because the C++ shared libs in this workspace are stale relative to upstream's recent cgo changes — unrelated to this PR's diff) - [ ] Manual / integration: verify a freshly mix-compacted segment with text-match fields lands on QueryNode with non-empty `text_stats_logs` and does NOT trigger the `[CGO_LOAD] CreateTextIndex` slow path in QueryNode logs 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Signed-off-by: cai.zhang <cai.zhang@zilliz.com> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
305 lines
10 KiB
Go
305 lines
10 KiB
Go
package datacoord
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/samber/lo"
|
|
"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/schemapb"
|
|
"github.com/milvus-io/milvus/internal/datacoord/allocator"
|
|
"github.com/milvus-io/milvus/internal/datacoord/session"
|
|
"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/taskcommon"
|
|
"github.com/milvus-io/milvus/pkg/v3/util/merr"
|
|
"github.com/milvus-io/milvus/pkg/v3/util/paramtable"
|
|
)
|
|
|
|
func TestMixCompactionTaskSuite(t *testing.T) {
|
|
suite.Run(t, new(MixCompactionTaskSuite))
|
|
}
|
|
|
|
type MixCompactionTaskSuite struct {
|
|
suite.Suite
|
|
|
|
mockMeta *MockCompactionMeta
|
|
}
|
|
|
|
func (s *MixCompactionTaskSuite) SetupTest() {
|
|
s.mockMeta = NewMockCompactionMeta(s.T())
|
|
}
|
|
|
|
func (s *MixCompactionTaskSuite) TestProcessRefreshPlan_NormalMix() {
|
|
channel := "Ch-1"
|
|
binLogs := []*datapb.FieldBinlog{getFieldBinlogIDs(101, 3)}
|
|
s.mockMeta.EXPECT().GetHealthySegment(mock.Anything, mock.Anything).RunAndReturn(func(ctx context.Context, segID int64) *SegmentInfo {
|
|
return &SegmentInfo{SegmentInfo: &datapb.SegmentInfo{
|
|
ID: segID,
|
|
Level: datapb.SegmentLevel_L1,
|
|
InsertChannel: channel,
|
|
State: commonpb.SegmentState_Flushed,
|
|
Binlogs: binLogs,
|
|
}}
|
|
}).Times(2)
|
|
task := newMixCompactionTask(&datapb.CompactionTask{
|
|
PlanID: 1,
|
|
TriggerID: 19530,
|
|
CollectionID: 1,
|
|
PartitionID: 10,
|
|
Type: datapb.CompactionType_MixCompaction,
|
|
NodeID: 1,
|
|
State: datapb.CompactionTaskState_executing,
|
|
InputSegments: []int64{200, 201},
|
|
ResultSegments: []int64{100, 200},
|
|
Schema: &schemapb.CollectionSchema{Version: 1},
|
|
}, nil, s.mockMeta, newMockVersionManager())
|
|
alloc := allocator.NewMockAllocator(s.T())
|
|
alloc.EXPECT().AllocN(mock.Anything).Return(100, 200, nil)
|
|
task.allocator = alloc
|
|
plan, err := task.BuildCompactionRequest()
|
|
s.Require().NoError(err)
|
|
|
|
s.Equal(2, len(plan.GetSegmentBinlogs()))
|
|
segIDs := lo.Map(plan.GetSegmentBinlogs(), func(b *datapb.CompactionSegmentBinlogs, _ int) int64 {
|
|
return b.GetSegmentID()
|
|
})
|
|
s.ElementsMatch([]int64{200, 201}, segIDs)
|
|
}
|
|
|
|
// Covers the FileResources branch in BuildCompactionRequest for MixCompaction
|
|
// plans (previously only SortCompaction was wired). Without this, mix-compacted
|
|
// segments with custom analyzers in ref mode would build text indexes using
|
|
// default tokenization → silent search regressions.
|
|
func (s *MixCompactionTaskSuite) TestBuildCompactionRequest_MixFileResourcesInRefMode() {
|
|
pt := paramtable.Get()
|
|
pt.Save(pt.CommonCfg.DNFileResourceMode.Key, "ref")
|
|
defer pt.Reset(pt.CommonCfg.DNFileResourceMode.Key)
|
|
|
|
channel := "Ch-1"
|
|
binLogs := []*datapb.FieldBinlog{getFieldBinlogIDs(101, 3)}
|
|
s.mockMeta.EXPECT().GetHealthySegment(mock.Anything, mock.Anything).RunAndReturn(func(ctx context.Context, segID int64) *SegmentInfo {
|
|
return &SegmentInfo{SegmentInfo: &datapb.SegmentInfo{
|
|
ID: segID,
|
|
Level: datapb.SegmentLevel_L1,
|
|
InsertChannel: channel,
|
|
State: commonpb.SegmentState_Flushed,
|
|
Binlogs: binLogs,
|
|
}}
|
|
}).Once()
|
|
|
|
expectedResources := []*internalpb.FileResourceInfo{
|
|
{Id: 7, Name: "dict", Path: "dict.jieba"},
|
|
}
|
|
s.mockMeta.EXPECT().GetFileResources(mock.Anything, mock.Anything).Return(expectedResources, nil).Once()
|
|
|
|
task := newMixCompactionTask(&datapb.CompactionTask{
|
|
PlanID: 1,
|
|
TriggerID: 19530,
|
|
CollectionID: 1,
|
|
PartitionID: 10,
|
|
Type: datapb.CompactionType_MixCompaction,
|
|
NodeID: 1,
|
|
State: datapb.CompactionTaskState_executing,
|
|
InputSegments: []int64{200},
|
|
Schema: &schemapb.CollectionSchema{
|
|
FileResourceIds: []int64{7},
|
|
},
|
|
}, nil, s.mockMeta, newMockVersionManager())
|
|
alloc := allocator.NewMockAllocator(s.T())
|
|
alloc.EXPECT().AllocN(mock.Anything).Return(100, 200, nil)
|
|
task.allocator = alloc
|
|
|
|
plan, err := task.BuildCompactionRequest()
|
|
s.Require().NoError(err)
|
|
s.Equal(expectedResources, plan.GetFileResources(),
|
|
"FileResources must flow through for MixCompaction plans (issue #50145, PR #50140)")
|
|
}
|
|
|
|
func (s *MixCompactionTaskSuite) TestProcessRefreshPlan_MixSegmentNotFound() {
|
|
channel := "Ch-1"
|
|
s.Run("segment_not_found", func() {
|
|
s.mockMeta.EXPECT().GetHealthySegment(mock.Anything, mock.Anything).RunAndReturn(func(ctx context.Context, segID int64) *SegmentInfo {
|
|
return nil
|
|
}).Once()
|
|
task := newMixCompactionTask(&datapb.CompactionTask{
|
|
PlanID: 1,
|
|
TriggerID: 19530,
|
|
CollectionID: 1,
|
|
PartitionID: 10,
|
|
Channel: channel,
|
|
Type: datapb.CompactionType_MixCompaction,
|
|
State: datapb.CompactionTaskState_executing,
|
|
NodeID: 1,
|
|
InputSegments: []int64{200, 201},
|
|
ResultSegments: []int64{100, 200},
|
|
Schema: &schemapb.CollectionSchema{Version: 1},
|
|
}, nil, s.mockMeta, newMockVersionManager())
|
|
_, err := task.BuildCompactionRequest()
|
|
s.Error(err)
|
|
s.ErrorIs(err, merr.ErrSegmentNotFound)
|
|
})
|
|
}
|
|
|
|
func (s *MixCompactionTaskSuite) TestBuildCompactionRequestSchemaVersionGuard() {
|
|
s.Run("nil_schema", func() {
|
|
task := newMixCompactionTask(&datapb.CompactionTask{
|
|
PlanID: 1,
|
|
Type: datapb.CompactionType_MixCompaction,
|
|
InputSegments: []int64{200},
|
|
}, nil, NewMockCompactionMeta(s.T()), newMockVersionManager())
|
|
|
|
_, err := task.BuildCompactionRequest()
|
|
s.Error(err)
|
|
s.ErrorIs(err, merr.ErrIllegalCompactionPlan)
|
|
})
|
|
|
|
s.Run("mix_task_schema_older_than_input", func() {
|
|
meta := NewMockCompactionMeta(s.T())
|
|
meta.EXPECT().GetHealthySegment(mock.Anything, int64(200)).Return(&SegmentInfo{SegmentInfo: &datapb.SegmentInfo{
|
|
ID: 200,
|
|
State: commonpb.SegmentState_Flushed,
|
|
SchemaVersion: 3,
|
|
}}).Once()
|
|
task := newMixCompactionTask(&datapb.CompactionTask{
|
|
PlanID: 1,
|
|
Type: datapb.CompactionType_MixCompaction,
|
|
InputSegments: []int64{200},
|
|
Schema: &schemapb.CollectionSchema{Version: 2},
|
|
}, nil, meta, newMockVersionManager())
|
|
|
|
_, err := task.BuildCompactionRequest()
|
|
s.Error(err)
|
|
s.ErrorIs(err, merr.ErrIllegalCompactionPlan)
|
|
})
|
|
|
|
s.Run("sort_task_schema_older_than_input", func() {
|
|
meta := NewMockCompactionMeta(s.T())
|
|
meta.EXPECT().GetHealthySegment(mock.Anything, int64(200)).Return(&SegmentInfo{SegmentInfo: &datapb.SegmentInfo{
|
|
ID: 200,
|
|
State: commonpb.SegmentState_Flushed,
|
|
SchemaVersion: 3,
|
|
}}).Once()
|
|
task := newMixCompactionTask(&datapb.CompactionTask{
|
|
PlanID: 1,
|
|
Type: datapb.CompactionType_SortCompaction,
|
|
InputSegments: []int64{200},
|
|
Schema: &schemapb.CollectionSchema{Version: 2},
|
|
}, nil, meta, newMockVersionManager())
|
|
task.slotUsage.Store(1)
|
|
|
|
_, err := task.BuildCompactionRequest()
|
|
s.Error(err)
|
|
s.ErrorIs(err, merr.ErrIllegalCompactionPlan)
|
|
})
|
|
|
|
for _, test := range []struct {
|
|
name string
|
|
compactionType datapb.CompactionType
|
|
taskSchema int32
|
|
inputSchema int32
|
|
storeSlotUsage bool
|
|
expectedSchema int32
|
|
}{
|
|
{
|
|
name: "mix_task_schema_newer_than_mixed_inputs_allowed",
|
|
compactionType: datapb.CompactionType_MixCompaction,
|
|
taskSchema: 4,
|
|
inputSchema: 3,
|
|
expectedSchema: 4,
|
|
},
|
|
{
|
|
name: "sort_task_schema_equal_input_allowed",
|
|
compactionType: datapb.CompactionType_SortCompaction,
|
|
taskSchema: 3,
|
|
inputSchema: 3,
|
|
storeSlotUsage: true,
|
|
expectedSchema: 3,
|
|
},
|
|
{
|
|
name: "sort_task_schema_newer_than_input_allowed",
|
|
compactionType: datapb.CompactionType_SortCompaction,
|
|
taskSchema: 4,
|
|
inputSchema: 3,
|
|
storeSlotUsage: true,
|
|
expectedSchema: 4,
|
|
},
|
|
} {
|
|
s.Run(test.name, func() {
|
|
meta := NewMockCompactionMeta(s.T())
|
|
meta.EXPECT().GetHealthySegment(mock.Anything, int64(200)).Return(&SegmentInfo{SegmentInfo: &datapb.SegmentInfo{
|
|
ID: 200,
|
|
State: commonpb.SegmentState_Flushed,
|
|
SchemaVersion: test.inputSchema,
|
|
Binlogs: []*datapb.FieldBinlog{getFieldBinlogIDs(101, 1)},
|
|
}}).Once()
|
|
task := newMixCompactionTask(&datapb.CompactionTask{
|
|
PlanID: 1,
|
|
Type: test.compactionType,
|
|
InputSegments: []int64{200},
|
|
Schema: &schemapb.CollectionSchema{Version: test.taskSchema},
|
|
}, nil, meta, newMockVersionManager())
|
|
if test.storeSlotUsage {
|
|
task.slotUsage.Store(1)
|
|
}
|
|
alloc := allocator.NewMockAllocator(s.T())
|
|
alloc.EXPECT().AllocN(mock.Anything).Return(int64(100), int64(200), nil).Once()
|
|
task.allocator = alloc
|
|
|
|
plan, err := task.BuildCompactionRequest()
|
|
s.NoError(err)
|
|
s.EqualValues(test.expectedSchema, plan.GetSchema().GetVersion())
|
|
s.Len(plan.GetSegmentBinlogs(), 1)
|
|
})
|
|
}
|
|
}
|
|
|
|
func (s *MixCompactionTaskSuite) TestProcess() {
|
|
s.Run("test process states", func() {
|
|
testCases := []struct {
|
|
state datapb.CompactionTaskState
|
|
processResult bool
|
|
}{
|
|
{state: datapb.CompactionTaskState_unknown, processResult: false},
|
|
{state: datapb.CompactionTaskState_pipelining, processResult: false},
|
|
{state: datapb.CompactionTaskState_executing, processResult: false},
|
|
{state: datapb.CompactionTaskState_failed, processResult: true},
|
|
{state: datapb.CompactionTaskState_timeout, processResult: true},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
task := newMixCompactionTask(&datapb.CompactionTask{
|
|
PlanID: 1,
|
|
State: tc.state,
|
|
}, nil, s.mockMeta, newMockVersionManager())
|
|
res := task.Process()
|
|
s.Equal(tc.processResult, res)
|
|
}
|
|
})
|
|
}
|
|
|
|
func (s *MixCompactionTaskSuite) TestQueryTaskOnWorker() {
|
|
cluster := session.NewMockCluster(s.T())
|
|
|
|
t1 := newMixCompactionTask(&datapb.CompactionTask{
|
|
PlanID: 1,
|
|
Type: datapb.CompactionType_MixCompaction,
|
|
StartTime: time.Now().Unix(),
|
|
Channel: "ch-1",
|
|
State: datapb.CompactionTaskState_executing,
|
|
NodeID: 111,
|
|
}, nil, s.mockMeta, newMockVersionManager())
|
|
|
|
s.mockMeta.EXPECT().SaveCompactionTask(mock.Anything, mock.Anything).Return(nil)
|
|
cluster.EXPECT().QueryCompaction(mock.Anything, mock.Anything).Return(
|
|
&datapb.CompactionPlanResult{PlanID: 1, State: datapb.CompactionTaskState_timeout}, nil).Once()
|
|
|
|
t1.QueryTaskOnWorker(cluster)
|
|
|
|
s.Equal(taskcommon.Retry, t1.GetTaskState())
|
|
}
|