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.

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

resource_control: watch delete with prev and refine test #7092

Merged
merged 11 commits into from
Sep 22, 2023

Conversation

HuSharp
Copy link
Member

@HuSharp HuSharp commented Sep 14, 2023

What problem does this PR solve?

Issue Number: Close #7095

What is changed and how does it work?

  • groupsController is updated by watch channel, but we need to enable WithPrevKV to acquire delete value.
    That will result In when occurring delete action groupsController will not updated by watch channel
  • remove watch resource groups interface which is just used in test
  • refine watch related test

Check List

Tests

  • Unit test
  • Integration test

Release note

None.

Signed-off-by: husharp <jinhao.hu@pingcap.com>
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Sep 14, 2023

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • CabinfeverB
  • nolouch

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

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

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Sep 14, 2023

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@ti-chi-bot ti-chi-bot bot added do-not-merge/needs-linked-issue release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Sep 14, 2023
@ti-chi-bot ti-chi-bot bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Sep 14, 2023
Signed-off-by: husharp <jinhao.hu@pingcap.com>
@codecov
Copy link

codecov bot commented Sep 14, 2023

Codecov Report

Merging #7092 (f9600a8) into master (e6c8841) will increase coverage by 0.05%.
Report is 1 commits behind head on master.
The diff coverage is 38.46%.

@@            Coverage Diff             @@
##           master    #7092      +/-   ##
==========================================
+ Coverage   74.31%   74.37%   +0.05%     
==========================================
  Files         440      440              
  Lines       47217    47195      -22     
==========================================
+ Hits        35088    35099      +11     
+ Misses       9034     9016      -18     
+ Partials     3095     3080      -15     
Flag Coverage Δ
unittests 74.37% <38.46%> (+0.05%) ⬆️

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

@CabinfeverB CabinfeverB requested review from CabinfeverB and removed request for HunDunDM September 14, 2023 08:02
@HuSharp HuSharp marked this pull request as ready for review September 14, 2023 08:25
@ti-chi-bot ti-chi-bot bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 14, 2023
@HuSharp HuSharp requested review from nolouch and removed request for JmPotato September 14, 2023 08:56
Copy link
Member

@CabinfeverB CabinfeverB left a comment

Choose a reason for hiding this comment

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

Could u add a test?
And in client.go there is also a implment of Watch Resource Group.

client/resource_group/controller/controller.go Outdated Show resolved Hide resolved
@ti-chi-bot ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Sep 15, 2023
@HuSharp HuSharp changed the title resource_control: watch delete prev resource_control: watch delete with prev and refine test Sep 15, 2023
@HuSharp
Copy link
Member Author

HuSharp commented Sep 15, 2023

Could u add a test? And in client.go there is also a implment of Watch Resource Group.

  • remove watchResourceGroups interface which is just used in test.
  • refine related watch test.

PTAL, thx!

@HuSharp HuSharp force-pushed the support_watch_delete_prev branch 2 times, most recently from d8304f2 to c53357a Compare September 15, 2023 04:35
@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 18, 2023
@HuSharp
Copy link
Member Author

HuSharp commented Sep 21, 2023

@nolouch friendly ping :)

@ti-chi-bot ti-chi-bot bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Sep 22, 2023
@nolouch
Copy link
Contributor

nolouch commented Sep 22, 2023

/merge

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Sep 22, 2023

@nolouch: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

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 ti-community-infra/tichi repository.

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Sep 22, 2023

This pull request has been accepted and is ready to merge.

Commit hash: 06470c6

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 22, 2023
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Sep 22, 2023

@HuSharp: Your PR was out of date, I have automatically updated it for you.

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

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 ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot bot merged commit f1107b2 into tikv:master Sep 22, 2023
21 of 23 checks passed
@HuSharp HuSharp deleted the support_watch_delete_prev branch September 22, 2023 12:43
nolouch pushed a commit to ti-chi-bot/pd that referenced this pull request Dec 6, 2023
close tikv#7095

Signed-off-by: husharp <jinhao.hu@pingcap.com>

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
Labels
release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

resource_control: can not delete resource groups by watch etcd
3 participants