Skip to content

fix: [cp2.6] apply denylist retry to pack_writer writeLog and binlog import#48436

Open
bigsheeper wants to merge 2 commits intomilvus-io:2.6from
bigsheeper:cp-2.6-48402
Open

fix: [cp2.6] apply denylist retry to pack_writer writeLog and binlog import#48436
bigsheeper wants to merge 2 commits intomilvus-io:2.6from
bigsheeper:cp-2.6-48402

Conversation

@bigsheeper
Copy link
Copy Markdown
Contributor

Cherry-pick from master

pr: #48402
issue: #48153

Summary

Cherry-picked from master PR #48402 (merged)

  • fix(High): pack_writer.go writeLog now skips retry only for non-retryable errors (permission denied, bucket not found, invalid credentials, etc.), matching the denylist strategy in retryable_reader.go.
  • fix(Medium): Binlog import's WithDownloader callbacks now use multiReadWithRetry, skipping retry only for non-retryable errors. Previously all transient failures were not retried.
  • fix(Low): IsMilvusError in merr/utils.go switched from errors.Cause (root only) to errors.As (full chain traversal).

Verification

  • File count matches original PR (7/8 — .gitignore already in 2.6)
  • Code changes verified
  • No conflict markers
  • Rebased onto latest upstream/2.6

@sre-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: bigsheeper
To complete the pull request process, please assign czs007 after the PR has been reviewed.
You can assign the PR to them by writing /assign @czs007 in a comment when ready.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@sre-ci-robot sre-ci-robot added the size/L Denotes a PR that changes 100-499 lines. label Mar 23, 2026
@mergify mergify bot added dco-passed DCO check passed. kind/bug Issues or changes related a bug labels Mar 23, 2026
@sre-ci-robot
Copy link
Copy Markdown
Contributor

[ci-v2-notice]
Notice: New ci-v2 system is enabled for this PR.

To rerun ci-v2 checks, comment with:

  • /ci-rerun-code-check // for ci-v2/code-check
  • /ci-rerun-build // for ci-v2/build
  • /ci-rerun-build-all // for ci-v2/build-all (multi-arch builds)
  • /ci-rerun-buildenv // for ci-v2/build-env (build milvus-env builder images)
  • /ci-rerun-ut-integration // for ci-v2/ut-integration, will rerun ci-v2/build
  • /ci-rerun-ut-go // for ci-v2/ut-go, will rerun ci-v2/build
  • /ci-rerun-ut-cpp // for ci-v2/ut-cpp
  • /ci-rerun-ut // for all ci-v2/ut-integration, ci-v2/ut-go, ci-v2/ut-cpp, will rerun ci-v2/build
  • /ci-rerun-e2e-arm // for ci-v2/e2e-arm
  • /ci-rerun-e2e-default // for ci-v2/e2e-default
  • /ci-rerun-ciloop // for ci-v2/ciloop (build + unit tests in one pipeline)
  • /ci-rerun-gosdk // for ci-v2/go-sdk (Go SDK E2E tests, AMD)
  • /ci-rerun-gosdk-arm // for ci-v2/go-sdk-arm (Go SDK E2E tests, ARM)

If you have any questions or requests, please contact @zhikunyao.

@sre-ci-robot sre-ci-robot added the do-not-merge/need-milestone generate by v2-label-manager label Mar 23, 2026
@sre-ci-robot
Copy link
Copy Markdown
Contributor

[INFO] PR Label Summary by Default
[SUCCESS] PR #48402 merged to master

[WARNING] Milestone not set

You can set milestone by commenting:
/set-milestone
Example:
/set-milestone 2.5.0

Use /refresh-label to update related check and label manually

@bigsheeper bigsheeper added this to the 2.6.14 milestone Mar 23, 2026
@codecov
Copy link
Copy Markdown

codecov bot commented Mar 23, 2026

Codecov Report

❌ Patch coverage is 97.05882% with 1 line in your changes missing coverage. Please review.
✅ Project coverage is 77.14%. Comparing base (2735790) to head (b69524f).
⚠️ Report is 23 commits behind head on 2.6.

Files with missing lines Patch % Lines
internal/flushcommon/syncmgr/pack_writer.go 90.00% 1 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##              2.6   #48436      +/-   ##
==========================================
+ Coverage   74.72%   77.14%   +2.41%     
==========================================
  Files        1417     1959     +542     
  Lines      222575   308458   +85883     
==========================================
+ Hits       166322   237959   +71637     
- Misses      48691    62937   +14246     
  Partials     7562     7562              
Components Coverage Δ
Client 78.73% <ø> (ø)
Core 83.39% <ø> (∅)
Go 75.72% <97.05%> (+<0.01%) ⬆️
Files with missing lines Coverage Δ
internal/util/importutilv2/binlog/reader.go 67.56% <100.00%> (+3.38%) ⬆️
pkg/util/merr/utils.go 53.11% <100.00%> (+0.55%) ⬆️
internal/flushcommon/syncmgr/pack_writer.go 58.92% <90.00%> (+0.68%) ⬆️

... and 572 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@sre-ci-robot sre-ci-robot added the low-code-coverage add test-label from zhikun, diff coverage > 80% label Mar 23, 2026
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Mar 23, 2026

@bigsheeper go-sdk check failed, comment rerun go-sdk can trigger the job again.

@bigsheeper
Copy link
Copy Markdown
Contributor Author

/refresh-label

@sre-ci-robot sre-ci-robot removed the do-not-merge/need-milestone generate by v2-label-manager label Mar 24, 2026
@sre-ci-robot
Copy link
Copy Markdown
Contributor

[INFO] PR Label Summary by Refresh-Label

  • Title: fix: [cp2.6] apply denylist retry to pack_writer writeLog and binlog import
  • Target: 2.6
  • Labels: kind/bug, size/L, dco-passed, do-not-merge/need-milestone, low-code-coverage

[SUCCESS] PR #48402 merged to master

Use /refresh-label to update related check and label manually

@sre-ci-robot
Copy link
Copy Markdown
Contributor

[INFO] PR Label Summary by Default
[SUCCESS] PR #48402 merged to master

Use /refresh-label to update related check and label manually

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Mar 24, 2026

@bigsheeper go-sdk check failed, comment rerun go-sdk can trigger the job again.

@sre-ci-robot sre-ci-robot removed the low-code-coverage add test-label from zhikun, diff coverage > 80% label Mar 24, 2026
@bigsheeper
Copy link
Copy Markdown
Contributor Author

rerun go-sdk

@mergify mergify bot added the ci-passed label Mar 24, 2026
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Mar 24, 2026

@bigsheeper go-sdk check failed, comment rerun go-sdk can trigger the job again.

bigsheeper and others added 2 commits March 24, 2026 17:46
…import

Cherry-pick from master PR milvus-io#48402

pr: milvus-io#48402
issue: milvus-io#48153

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Signed-off-by: Yihao Dai <yihao.dai@zilliz.com>
Cherry-pick accidentally introduced an unused `indexpb` import,
causing static-check and UT build failures in internal/flushcommon/syncmgr.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Signed-off-by: Yihao Dai <yihao.dai@zilliz.com>
@sre-ci-robot
Copy link
Copy Markdown
Contributor

[INFO] PR Label Summary by Default
[SUCCESS] PR #48402 merged to master

Use /refresh-label to update related check and label manually

@czs007
Copy link
Copy Markdown
Collaborator

czs007 commented Mar 30, 2026

/ci-rerun-e2e-arm

1 similar comment
@bigsheeper
Copy link
Copy Markdown
Contributor Author

/ci-rerun-e2e-arm

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci-passed dco-passed DCO check passed. kind/bug Issues or changes related a bug size/L Denotes a PR that changes 100-499 lines.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants