Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: parameter check of TransferReplica and TransferNode #32297

Merged
merged 1 commit into from
Apr 17, 2024
Merged

fix: parameter check of TransferReplica and TransferNode #32297

merged 1 commit into from
Apr 17, 2024

Conversation

chyezh
Copy link
Contributor

@chyezh chyezh commented Apr 16, 2024

issue: #30647

  • Same dst and src resource group should not be allowed in TransferReplica and TransferNode.

  • Remove redundant parameter check.

@sre-ci-robot sre-ci-robot added the size/L Denotes a PR that changes 100-499 lines. label Apr 16, 2024
@mergify mergify bot added dco-passed DCO check passed. kind/bug Issues or changes related a bug labels Apr 16, 2024
chyezh
chyezh commented Apr 16, 2024
View reviewed changes
internal/querycoordv2/meta/replica_manager_test.go
// 1004: {
// spawnConfig: map[string]int{"RG4": 2, "RG5": 3},
// },
1000: {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Recover the test case

chyezh
chyezh commented Apr 16, 2024
View reviewed changes
internal/querycoordv2/services.go
@@ -1141,11 +1126,6 @@ func (s *Server) TransferReplica(ctx context.Context, req *querypb.TransferRepli
fmt.Sprintf("the target resource group[%s] doesn't exist", req.GetTargetResourceGroup()))), nil
}

if req.GetNumReplica() <= 0 {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

already checked by meta.TransferReplica

chyezh
chyezh commented Apr 16, 2024
View reviewed changes
internal/querycoordv2/services.go
@@ -1089,21 +1089,6 @@ func (s *Server) TransferNode(ctx context.Context, req *milvuspb.TransferNodeReq
return merr.Status(err), nil
}

if ok := s.meta.ResourceManager.ContainResourceGroup(req.GetSourceResourceGroup()); !ok {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

already checked by TransferNode

@mergify Mergify
Copy link
Contributor

mergify bot commented Apr 16, 2024

@chyezh E2e jenkins job failed, comment /run-cpu-e2e can trigger the job again.

@codecov Codecov
Copy link

codecov bot commented Apr 16, 2024 •
edited

Codecov Report

Attention: Patch coverage is 70.00000% with 3 lines in your changes are missing coverage. Please review.

Project coverage is 81.77%. Comparing base (df2ca7f) to head (a73f25f).
Report is 22 commits behind head on master.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #32297      +/-   ##
==========================================
+ Coverage   81.71%   81.77%   +0.06%     
==========================================
  Files         999      989      -10     
  Lines      123915   124142     +227     
==========================================
+ Hits       101252   101523     +271     
+ Misses      18775    18741      -34     
+ Partials     3888     3878      -10
Files Coverage Δ
internal/querycoordv2/meta/replica_manager.go 81.27% <100.00%> (ø)
internal/querycoordv2/services.go 85.17% <ø> (ø)
internal/querycoordv2/meta/resource_manager.go 74.60% <40.00%> (ø)

... and 220 files with indirect coverage changes

@chyezh
fix: parameter check of TransferReplica and TransferNode
a73f25f 
Signed-off-by: chyezh <chyezh@outlook.com>
@mergify Mergify
Copy link
Contributor

mergify bot commented Apr 16, 2024

@chyezh E2e jenkins job failed, comment /run-cpu-e2e can trigger the job again.

@chyezh
Copy link
Contributor Author

chyezh commented Apr 17, 2024

/run-cpu-e2e

@weiliu1031
Copy link
Contributor

/lgtm

congqixia
congqixia approved these changes Apr 17, 2024
View reviewed changes
Copy link
Contributor

@congqixia congqixia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@sre-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chyezh, 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

@yanliang567 yanliang567 added ci-passed manual-pass manually set pass before ci-passed labeled labels Apr 17, 2024
@sre-ci-robot sre-ci-robot merged commit a8c8a6b into milvus-io:master Apr 17, 2024
14 of 15 checks passed
@chyezh chyezh deleted the fix_check_same_src_dst_rg branch April 17, 2024 08:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@congqixia congqixia congqixia approved these changes

@sunby sunby Awaiting requested review from sunby

Assignees

@congqixia congqixia

@weiliu1031 weiliu1031

Labels
approved ci-passed dco-passed DCO check passed. kind/bug Issues or changes related a bug lgtm manual-pass manually set pass before ci-passed labeled size/L Denotes a PR that changes 100-499 lines.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@chyezh @weiliu1031 @sre-ci-robot @congqixia @yanliang567