mirror of
https://gitee.com/milvus-io/milvus.git
synced 2025-12-28 14:35:27 +08:00
### **User description** issue: #46466 ___ ### **PR Type** Bug fix ___ ### **Description** - Extract finished task state check into reusable helper function - Skip finished tasks during compaction recovery to prevent reprocessing - Add backward compatibility check for pre-allocated segment IDs ___ ### Diagram Walkthrough ```mermaid flowchart LR A["Compaction Task States"] -->|"Check with helper"| B["isCompactionTaskFinished()"] B -->|"Used in"| C["compactionInspector.loadMeta()"] B -->|"Used in"| D["compactionTaskMeta.reloadFromKV()"] C -->|"Skip finished tasks"| E["Recovery Process"] D -->|"Backward compatibility"| E ``` <details><summary><h3>File Walkthrough</h3></summary> <table><thead><tr><th></th><th align="left">Relevant files</th></tr></thead><tbody><tr><td><strong>Enhancement</strong></td><td><table> <tr> <td> <details> <summary><strong>compaction_util.go</strong><dd><code>Add isCompactionTaskFinished helper function</code> </dd></summary> <hr> internal/datacoord/compaction_util.go <ul><li>Added new helper function <code>isCompactionTaskFinished()</code> to check if a <br>compaction task is in a terminal state<br> <li> Function checks for failed, timeout, completed, cleaned, or unknown <br>states<br> <li> Centralizes task state validation logic for reuse across multiple <br>components</ul> </details> </td> <td><a href="https://github.com/milvus-io/milvus/pull/46515/files#diff-8f2cb8d0fef37617202c5a2290ad2bdbf2df5b5983604b5b505bc73a65c7eb43">+8/-0</a> </td> </tr> </table></td></tr><tr><td><strong>Bug fix</strong></td><td><table> <tr> <td> <details> <summary><strong>compaction_inspector.go</strong><dd><code>Refactor to use finished task helper function</code> </dd></summary> <hr> internal/datacoord/compaction_inspector.go <ul><li>Replaced inline state checks with call to <code>isCompactionTaskFinished()</code> <br>helper<br> <li> Simplifies code by removing repetitive state comparison logic<br> <li> Maintains same behavior of skipping finished tasks during recovery</ul> </details> </td> <td><a href="https://github.com/milvus-io/milvus/pull/46515/files#diff-1c884001f2e84de177fea22b584f3de70a6e73695dbffa34031be9890d17da6d">+1/-5</a> </td> </tr> <tr> <td> <details> <summary><strong>compaction_task_meta.go</strong><dd><code>Add finished task check for backward compatibility</code> </dd></summary> <hr> internal/datacoord/compaction_task_meta.go <ul><li>Added check to skip finished tasks before processing pre-allocated <br>segment IDs<br> <li> Ensures backward compatibility for tasks without pre-allocated segment <br>IDs<br> <li> Prevents marking already-finished tasks as failed during reload</ul> </details> </td> <td><a href="https://github.com/milvus-io/milvus/pull/46515/files#diff-0dae7214c4c79ddf5106bd51d375b5fb2f41239d5d433798afa90708e443eca8">+1/-1</a> </td> </tr> </table></td></tr></tbody></table> </details> ___ <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Bug Fixes** * Improved detection of finished compaction tasks to reduce false failures. * Prevented finished tasks with missing pre-allocations from being incorrectly marked as failed. * Simplified abandonment logic for completed/timeout/cleaned tasks to reduce erroneous retries and noisy logs. <sub>✏️ Tip: You can customize this high-level summary in your review settings.</sub> <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Signed-off-by: Cai Zhang <cai.zhang@zilliz.com>
127 lines
4.5 KiB
Go
127 lines
4.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 (
|
|
"google.golang.org/protobuf/proto"
|
|
|
|
"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
|
|
"github.com/milvus-io/milvus/internal/datacoord/allocator"
|
|
"github.com/milvus-io/milvus/internal/util/hookutil"
|
|
"github.com/milvus-io/milvus/internal/util/importutilv2"
|
|
"github.com/milvus-io/milvus/pkg/v2/proto/datapb"
|
|
"github.com/milvus-io/milvus/pkg/v2/proto/workerpb"
|
|
"github.com/milvus-io/milvus/pkg/v2/util/paramtable"
|
|
)
|
|
|
|
// PreAllocateBinlogIDs pre-allocates binlog IDs based on the total number of binlogs from
|
|
// the segments for compaction, multiplied by an expansion factor.
|
|
func PreAllocateBinlogIDs(allocator allocator.Allocator, segmentInfos []*SegmentInfo) (*datapb.IDRange, error) {
|
|
binlogNum := 0
|
|
for _, s := range segmentInfos {
|
|
for _, l := range s.GetBinlogs() {
|
|
binlogNum += len(l.GetBinlogs())
|
|
}
|
|
for _, l := range s.GetDeltalogs() {
|
|
binlogNum += len(l.GetBinlogs())
|
|
}
|
|
for _, l := range s.GetStatslogs() {
|
|
binlogNum += len(l.GetBinlogs())
|
|
}
|
|
for _, l := range s.GetBm25Statslogs() {
|
|
binlogNum += len(l.GetBinlogs())
|
|
}
|
|
}
|
|
n := binlogNum * paramtable.Get().DataCoordCfg.CompactionPreAllocateIDExpansionFactor.GetAsInt()
|
|
begin, end, err := allocator.AllocN(int64(n))
|
|
return &datapb.IDRange{Begin: begin, End: end}, err
|
|
}
|
|
|
|
func WrapPluginContextWithImport(collectionID int64, dbProperties []*commonpb.KeyValuePair, options importutilv2.Options, msg proto.Message) {
|
|
pluginContext := make([]*commonpb.KeyValuePair, 0)
|
|
|
|
importEzk, _ := importutilv2.GetEZK(options)
|
|
readPluginContext := hookutil.GetReadStoragePluginContext(importEzk)
|
|
if readPluginContext != nil {
|
|
pluginContext = append(pluginContext, readPluginContext...)
|
|
}
|
|
|
|
writePluginContext := hookutil.GetStoragePluginContext(dbProperties, collectionID)
|
|
if writePluginContext != nil {
|
|
pluginContext = append(pluginContext, writePluginContext...)
|
|
}
|
|
|
|
if len(pluginContext) == 0 {
|
|
return
|
|
}
|
|
|
|
switch msg.(type) {
|
|
case *datapb.ImportRequest:
|
|
job := msg.(*datapb.ImportRequest)
|
|
job.PluginContext = append(job.PluginContext, pluginContext...)
|
|
case *datapb.PreImportRequest:
|
|
job := msg.(*datapb.PreImportRequest)
|
|
job.PluginContext = append(job.PluginContext, pluginContext...)
|
|
default:
|
|
return
|
|
}
|
|
}
|
|
|
|
func WrapPluginContext(collectionID int64, properties []*commonpb.KeyValuePair, msg proto.Message) {
|
|
pluginContext := hookutil.GetStoragePluginContext(properties, collectionID)
|
|
if pluginContext == nil {
|
|
return
|
|
}
|
|
|
|
switch msg.(type) {
|
|
case *datapb.CompactionPlan:
|
|
plan := msg.(*datapb.CompactionPlan)
|
|
plan.PluginContext = append(plan.PluginContext, pluginContext...)
|
|
case *workerpb.CreateJobRequest:
|
|
job := msg.(*workerpb.CreateJobRequest)
|
|
job.PluginContext = append(job.PluginContext, pluginContext...)
|
|
case *workerpb.AnalyzeRequest:
|
|
job := msg.(*workerpb.AnalyzeRequest)
|
|
job.PluginContext = append(job.PluginContext, pluginContext...)
|
|
case *workerpb.CreateStatsRequest:
|
|
job := msg.(*workerpb.CreateStatsRequest)
|
|
job.PluginContext = append(job.PluginContext, pluginContext...)
|
|
case *datapb.ImportRequest:
|
|
job := msg.(*datapb.ImportRequest)
|
|
job.PluginContext = append(job.PluginContext, pluginContext...)
|
|
case *datapb.PreImportRequest:
|
|
job := msg.(*datapb.PreImportRequest)
|
|
job.PluginContext = append(job.PluginContext, pluginContext...)
|
|
default:
|
|
return
|
|
}
|
|
}
|
|
|
|
// isCompactionTaskFinished returns true if the task has reached a terminal state
|
|
// (timeout, completed, cleaned, or unknown) and requires no further processing.
|
|
func isCompactionTaskFinished(t *datapb.CompactionTask) bool {
|
|
switch t.GetState() {
|
|
case datapb.CompactionTaskState_timeout,
|
|
datapb.CompactionTaskState_completed,
|
|
datapb.CompactionTaskState_cleaned,
|
|
datapb.CompactionTaskState_unknown:
|
|
return true
|
|
default:
|
|
return false
|
|
}
|
|
}
|