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

server: skip the engine key when match store label #8486

Merged
merged 2 commits into from
Aug 6, 2024
Merged

server: skip the engine key when match store label #8486

merged 2 commits into from
Aug 6, 2024

Conversation

rleungx
Copy link
Member

@rleungx rleungx commented Aug 2, 2024

What problem does this PR solve?

Issue Number: Close #8480.

What is changed and how does it work?

Check List

Tests

  • Unit test

Release note

None.

@ti-chi-bot ti-chi-bot bot added do-not-merge/needs-triage-completed release-note-none Denotes a PR that doesn't merit a release note. dco-signoff: yes Indicates the PR's author has signed the dco. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 2, 2024
@codecov Codecov
Copy link

codecov bot commented Aug 2, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 77.41%. Comparing base (838ee79) to head (251b478).
Report is 40 commits behind head on master.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #8486      +/-   ##
==========================================
+ Coverage   77.30%   77.41%   +0.11%     
==========================================
  Files         472      472              
  Lines       61789    61782       -7     
==========================================
+ Hits        47766    47831      +65     
+ Misses      10448    10381      -67     
+ Partials     3575     3570       -5
Flag Coverage Δ
unittests 77.41% <100.00%> (+0.11%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

@rleungx
Copy link
Member Author

rleungx commented Aug 5, 2024

/check-issue-triage-complete

@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Aug 5, 2024
okJiang
okJiang approved these changes Aug 5, 2024
View reviewed changes
Copy link
Member

@okJiang okJiang left a comment •
edited
Loading

Choose a reason for hiding this comment

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

LGTM, But LocationLabels seems to have been designed to be equivalent to Labels (if not, ignore it), but now there are other concepts for Labels, such as engine. So it's not clear if there are other places where this gap exists

server/api/label_test.go
Comment on lines +302 to +304
valid: true,
expectError: "placement rules is disabled",
},
Copy link
Member

Choose a reason for hiding this comment

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

Is it unnecessary?

Copy link
Member Author

Choose a reason for hiding this comment

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

I think yes, cuz we cannot add a TiFlash store when the placement rule is set to disable.

Copy link
Member Author

Choose a reason for hiding this comment

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

There is no guarantee that LocationLabels should be equivalent to Labels.

@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Aug 5, 2024

@okJiang: adding LGTM is restricted to approvers and reviewers in OWNERS files.

In response to this:

LGTM, But LocationLabels seems to have been designed to be equivalent to Labels (if not, ignore it), but now there are other concepts for Labels, such as engine. So it's not clear if there are other places where this gap exists

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ti-chi-bot ti-chi-bot bot added the lgtm label Aug 6, 2024
@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Aug 6, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JmPotato, nolouch, okJiang

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

@ti-chi-bot ti-chi-bot bot removed the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Aug 6, 2024
@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Aug 6, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-08-05 05:55:02.001204042 +0000 UTC m=+245031.868303149: ☑️ agreed by JmPotato.
  • 2024-08-06 04:21:18.107196527 +0000 UTC m=+325807.974295615: ☑️ agreed by nolouch.

@ti-chi-bot ti-chi-bot bot merged commit c8ad186 into tikv:master Aug 6, 2024
21 checks passed
@rleungx rleungx deleted the fix-strictly-match-label branch August 6, 2024 05:56
@HuSharp HuSharp added needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. needs-cherry-pick-release-8.1 Should cherry pick this PR to release-8.1 branch. labels Aug 27, 2024
ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Aug 27, 2024
@rleungx @ti-chi-bot
This is an automated cherry-pick of tikv#8486
5845e7c 
close tikv#8480

Signed-off-by: ti-chi-bot <[email protected]>
@ti-chi-bot ti-chi-bot mentioned this pull request Aug 27, 2024
Merged
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.5: #8572.

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.1: #8573.

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Aug 27, 2024
@rleungx @ti-chi-bot
This is an automated cherry-pick of tikv#8486
271f445 
close tikv#8480

Signed-off-by: ti-chi-bot <[email protected]>
ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Aug 27, 2024
@rleungx @ti-chi-bot
This is an automated cherry-pick of tikv#8486
b58a978 
close tikv#8480

Signed-off-by: ti-chi-bot <[email protected]>
@ti-chi-bot ti-chi-bot mentioned this pull request Aug 27, 2024
Merged
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-5.4: #8574.

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-8.1: #8575.

This was referenced Aug 27, 2024
Merged
Merged
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.1: #8576.

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Aug 27, 2024
@rleungx @ti-chi-bot
This is an automated cherry-pick of tikv#8486
fa644ae 
close tikv#8480

Signed-off-by: ti-chi-bot <[email protected]>
@ti-chi-bot ti-chi-bot mentioned this pull request Aug 27, 2024
Merged
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.5: #8577.

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Aug 27, 2024
@rleungx @ti-chi-bot
This is an automated cherry-pick of tikv#8486
10c6ca3 
close tikv#8480

Signed-off-by: ti-chi-bot <[email protected]>
@ti-chi-bot ti-chi-bot mentioned this pull request Aug 27, 2024
Merged
ti-chi-bot bot pushed a commit that referenced this pull request Aug 27, 2024
@ti-chi-bot @rleungx
server: skip the engine key when match store label (#8486) (#8575)
beb3abf 
close #8480

Signed-off-by: Ryan Leung <[email protected]>

Co-authored-by: Ryan Leung <[email protected]>
ti-chi-bot bot added a commit that referenced this pull request Aug 27, 2024
@ti-chi-bot @rleungx @ti-chi-bot
server: skip the engine key when match store label (#8486) (#8572)
83953be 
close #8480

Signed-off-by: ti-chi-bot <[email protected]>
Signed-off-by: Ryan Leung <[email protected]>

Co-authored-by: Ryan Leung <[email protected]>
Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
ti-chi-bot bot pushed a commit that referenced this pull request Aug 28, 2024
@ti-chi-bot @rleungx
server: skip the engine key when match store label (#8486) (#8576)
5231919 
close #8480

Signed-off-by: ti-chi-bot <[email protected]>
Signed-off-by: Ryan Leung <[email protected]>

Co-authored-by: Ryan Leung <[email protected]>
ti-chi-bot bot pushed a commit that referenced this pull request Aug 28, 2024
@ti-chi-bot @rleungx
server: skip the engine key when match store label (#8486) (#8577)
3bd5748 
close #8480

Signed-off-by: ti-chi-bot <[email protected]>
Signed-off-by: Ryan Leung <[email protected]>

Co-authored-by: Ryan Leung <[email protected]>
ti-chi-bot bot pushed a commit that referenced this pull request Aug 28, 2024
@ti-chi-bot @rleungx
server: skip the engine key when match store label (#8486) (#8573)
064986b 
close #8480

Signed-off-by: ti-chi-bot <[email protected]>
Signed-off-by: Ryan Leung <[email protected]>

Co-authored-by: Ryan Leung <[email protected]>
ti-chi-bot bot added a commit that referenced this pull request Sep 11, 2024
@ti-chi-bot @rleungx
@purelind @ti-chi-bot
server: skip the engine key when match store label (#8486) (#8574)
a8ea617 
close #8480

Signed-off-by: Ryan Leung <[email protected]>

Co-authored-by: Ryan Leung <[email protected]>
Co-authored-by: Purelind <[email protected]>
Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@okJiang okJiang okJiang approved these changes

@nolouch nolouch nolouch approved these changes

@JmPotato JmPotato JmPotato approved these changes

Assignees
No one assigned
Labels
approved dco-signoff: yes Indicates the PR's author has signed the dco. lgtm needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. needs-cherry-pick-release-8.1 Should cherry pick this PR to release-8.1 branch. release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

replication.strictly-match-label=true & engine=tiflash have Incompatibility problem
6 participants
@rleungx @ti-chi-bot @JmPotato @nolouch @okJiang @HuSharp