Skip to content

Conversation

@congqixia
Copy link
Contributor

Cherry-pick from master
pr: #45969
Related to #45960
Follow-up to #45961

After #45961 ensured that handleNodeUp is always called for nodes discovered during rewatchNodes (including stopping nodes), this change adds a safeguard in ResourceManager.handleNodeUp to skip adding stopping nodes to resource groups.

  1. resource_manager.go: Add check for IsStoppingState() in handleNodeUp to prevent stopping nodes from being added to incomingNode set and assigned to resource groups.

  2. server.go:

  • Delete processed nodes from sessionMap to avoid duplicate processing in the subsequent loop
    • Add warning logs for stopping state transitions during rewatch

…ilvus-io#45969)

Related to milvus-io#45960
Follow-up to milvus-io#45961

After milvus-io#45961 ensured that handleNodeUp is always called for nodes
discovered during rewatchNodes (including stopping nodes), this change
adds a safeguard in ResourceManager.handleNodeUp to skip adding stopping
nodes to resource groups.

1. **resource_manager.go**: Add check for IsStoppingState() in
handleNodeUp to prevent stopping nodes from being added to incomingNode
set and assigned to resource groups.

2. **server.go**:
- Delete processed nodes from sessionMap to avoid duplicate processing
in the subsequent loop
   - Add warning logs for stopping state transitions during rewatch

Signed-off-by: Congqi Xia <[email protected]>
@congqixia congqixia added this to the 2.5.24 milestone Dec 1, 2025
@sre-ci-robot sre-ci-robot requested review from sunby and yah01 December 1, 2025 09:23
@sre-ci-robot sre-ci-robot added the size/S Denotes a PR that changes 10-29 lines. label Dec 1, 2025
@sre-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: congqixia

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

The pull request process is described here

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

@mergify mergify bot added dco-passed DCO check passed. kind/enhancement Issues or changes related to enhancement labels Dec 1, 2025
@sre-ci-robot
Copy link
Contributor

[ci-v2-notice]
Notice: We are gradually rolling out the new ci-v2 system.

  • Legacy CI jobs remain unaffected, you can just ignore ci-v2 if you don't want to run it.
  • Additional "ci-v2/*" checkers will run for this PR to ensure the new ci-v2 system is working as expected.
  • For tests that exist in both v1 and v2, passing in either system is considered PASS.

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-ut-integration // for ci-v2/ut-integration
  • /ci-rerun-ut-go // for ci-v2/ut-go
  • /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
  • /ci-rerun-e2e-arm // for ci-v2/e2e-arm [master branch only]
  • /ci-rerun-e2e-default // for ci-v2/e2e-default [master branch only]

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

@sre-ci-robot
Copy link
Contributor

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

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

@codecov
Copy link

codecov bot commented Dec 1, 2025

Codecov Report

❌ Patch coverage is 60.00000% with 6 lines in your changes missing coverage. Please review.
✅ Project coverage is 82.03%. Comparing base (3a7a08f) to head (459449f).
⚠️ Report is 69 commits behind head on 2.5.

Files with missing lines Patch % Lines
internal/querycoordv2/server.go 33.33% 5 Missing and 1 partial ⚠️

❌ Your patch status has failed because the patch coverage (60.00%) is below the target coverage (80.00%). You can increase the patch coverage or adjust the target coverage.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##              2.5   #45982      +/-   ##
==========================================
- Coverage   82.10%   82.03%   -0.07%     
==========================================
  Files        1128     1587     +459     
  Lines      179181   248836   +69655     
==========================================
+ Hits       147110   204140   +57030     
- Misses      26099    38677   +12578     
- Partials     5972     6019      +47     
Components Coverage Δ
Client 78.90% <22.22%> (-0.06%) ⬇️
Core 84.56% <81.97%> (∅)
Go 82.34% <76.51%> (-0.03%) ⬇️
Files with missing lines Coverage Δ
internal/querycoordv2/meta/resource_manager.go 82.37% <100.00%> (-0.27%) ⬇️
internal/querycoordv2/server.go 79.24% <33.33%> (-0.18%) ⬇️

... and 512 files with indirect coverage changes

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

@mergify mergify bot added the ci-passed label Dec 1, 2025
@weiliu1031
Copy link
Contributor

/lgtm

@sre-ci-robot
Copy link
Contributor

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

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

@sre-ci-robot sre-ci-robot merged commit e70e706 into milvus-io:2.5 Dec 2, 2025
15 of 19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved ci-passed dco-passed DCO check passed. kind/enhancement Issues or changes related to enhancement lgtm size/S Denotes a PR that changes 10-29 lines.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants