mcs: support ttl config #7409

rleungx · 2023-11-22T03:10:47Z

What problem does this PR solve?

Issue Number: Close #7296

What is changed and how does it work?

This PR supports TTL config for scheduling service.

Check List

Tests

Unit test

Release note

None.

ti-chi-bot · 2023-11-22T03:10:50Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

CabinfeverB
lhy1024

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.

codecov · 2023-11-22T03:21:33Z

Codecov Report

Merging #7409 (57a642c) into master (58e9b20) will decrease coverage by 0.01%.
Report is 1 commits behind head on master.
The diff coverage is 80.41%.

❗ Current head 57a642c differs from pull request most recent head 58f9402. Consider uploading reports for the commit 58f9402 to get more accurate results

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #7409      +/-   ##
==========================================
- Coverage   74.25%   74.25%   -0.01%     
==========================================
  Files         451      451              
  Lines       49587    49629      +42     
==========================================
+ Hits        36820    36850      +30     
- Misses       9470     9476       +6     
- Partials     3297     3303       +6

Flag	Coverage Δ
unittests	`74.25% <80.41%> (-0.01%)`	⬇️

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

lhy1024 · 2023-11-22T09:48:59Z

pkg/mcs/scheduling/server/server.go

@@ -534,7 +535,7 @@ func CreateServer(ctx context.Context, cfg *config.Config) *Server {
 		BaseServer:        server.NewBaseServer(ctx),
 		DiagnosticsServer: sysutil.NewDiagnosticsServer(cfg.Log.File.Filename),
 		cfg:               cfg,
-		persistConfig:     config.NewPersistConfig(cfg),
+		persistConfig:     config.NewPersistConfig(cfg, cache.NewStringTTL(ctx, time.Second*5, time.Minute*5)),


how about using a const value

Will we do it?

lhy1024 · 2023-11-22T09:49:29Z

server/config/persist_options.go

-	if err != nil {
-		return err
+	if ttl != 0 {
+		// the minimum ttl is 5 seconds, if the given ttl is less than 5 seconds, we will use 5 seconds instead.


why add minium?

It's set by etcd

lhy1024

the rest LGTM

lhy1024 · 2023-11-27T03:03:25Z

pkg/mcs/scheduling/server/server.go

@@ -534,7 +535,7 @@ func CreateServer(ctx context.Context, cfg *config.Config) *Server {
 		BaseServer:        server.NewBaseServer(ctx),
 		DiagnosticsServer: sysutil.NewDiagnosticsServer(cfg.Log.File.Filename),
 		cfg:               cfg,
-		persistConfig:     config.NewPersistConfig(cfg),
+		persistConfig:     config.NewPersistConfig(cfg, cache.NewStringTTL(ctx, time.Second*5, time.Minute*5)),


Will we do it?

Signed-off-by: Ryan Leung <rleungx@gmail.com>

CabinfeverB

rest LGTM

CabinfeverB · 2023-11-27T06:45:59Z

tests/server/config/config_test.go

@@ -491,11 +491,11 @@ func (suite *configTestSuite) assertTTLConfigItemEqaul(
 		}
 		return false
 	}
-	suite.True(checkfunc(cluster.GetLeaderServer().GetServer().GetPersistOptions()))
+	suite.True(checkFunc(cluster.GetLeaderServer().GetServer().GetPersistOptions()))
 	if cluster.GetSchedulingPrimaryServer() != nil {
 		// wait for the scheduling primary server to be synced


The check here does not include ttl expired cases? Because there was no waiting.

rleungx · 2023-11-27T08:31:36Z

/merge

ti-chi-bot · 2023-11-27T08:31:38Z

@rleungx: 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 · 2023-11-27T08:31:40Z

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

Commit hash: 57a642c

ti-chi-bot · 2023-11-27T08:31:53Z

@rleungx: 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.

close tikv#7296 Signed-off-by: Ryan Leung <rleungx@gmail.com> Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>

ti-chi-bot bot added the release-note-none label Nov 22, 2023

ti-chi-bot bot requested review from HunDunDM and lhy1024 November 22, 2023 03:10

ti-chi-bot bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Nov 22, 2023

rleungx force-pushed the ttl branch from 45c32e6 to 927ba0a Compare November 22, 2023 03:23

rleungx requested review from JmPotato and CabinfeverB and removed request for HunDunDM November 22, 2023 03:23

rleungx force-pushed the ttl branch from 927ba0a to 709b68c Compare November 22, 2023 03:24

lhy1024 reviewed Nov 22, 2023

View reviewed changes

rleungx requested a review from lhy1024 November 27, 2023 03:01

lhy1024 reviewed Nov 27, 2023

View reviewed changes

rleungx added 2 commits November 27, 2023 11:08

support ttl config

e9ea7bf

Signed-off-by: Ryan Leung <rleungx@gmail.com>

fix race

49f49f0

Signed-off-by: Ryan Leung <rleungx@gmail.com>

rleungx force-pushed the ttl branch from c42f892 to dd71b53 Compare November 27, 2023 03:16

address the comment

57a642c

Signed-off-by: Ryan Leung <rleungx@gmail.com>

rleungx force-pushed the ttl branch from dd71b53 to 57a642c Compare November 27, 2023 03:36

lhy1024 approved these changes Nov 27, 2023

View reviewed changes

ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 27, 2023

CabinfeverB reviewed Nov 27, 2023

View reviewed changes

CabinfeverB approved these changes Nov 27, 2023

View reviewed changes

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 Nov 27, 2023

ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 27, 2023

Merge branch 'master' into ttl

58f9402

ti-chi-bot bot merged commit a09717b into tikv:master Nov 27, 2023
22 checks passed

rleungx deleted the ttl branch November 27, 2023 08:44

rleungx mentioned this pull request Nov 30, 2023

Separate scheduling into an independent service #5839

Closed

rleungx added a commit to rleungx/pd that referenced this pull request Dec 1, 2023

mcs: support ttl config (tikv#7409)

31e4c41

close tikv#7296 Signed-off-by: Ryan Leung <rleungx@gmail.com> Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

mcs: support ttl config #7409

mcs: support ttl config #7409

rleungx commented Nov 22, 2023

ti-chi-bot bot commented Nov 22, 2023 •

edited

codecov bot commented Nov 22, 2023 •

edited

lhy1024 Nov 22, 2023

lhy1024 Nov 27, 2023

rleungx Nov 27, 2023

lhy1024 Nov 22, 2023

rleungx Nov 22, 2023

lhy1024 left a comment

lhy1024 Nov 27, 2023

CabinfeverB left a comment

CabinfeverB Nov 27, 2023

rleungx commented Nov 27, 2023

ti-chi-bot bot commented Nov 27, 2023

ti-chi-bot bot commented Nov 27, 2023

ti-chi-bot bot commented Nov 27, 2023

mcs: support ttl config #7409

mcs: support ttl config #7409

Conversation

rleungx commented Nov 22, 2023

What problem does this PR solve?

What is changed and how does it work?

Check List

Release note

ti-chi-bot bot commented Nov 22, 2023 • edited

codecov bot commented Nov 22, 2023 • edited

Codecov Report

lhy1024 Nov 22, 2023

Choose a reason for hiding this comment

lhy1024 Nov 27, 2023

Choose a reason for hiding this comment

rleungx Nov 27, 2023

Choose a reason for hiding this comment

lhy1024 Nov 22, 2023

Choose a reason for hiding this comment

rleungx Nov 22, 2023

Choose a reason for hiding this comment

lhy1024 left a comment

Choose a reason for hiding this comment

lhy1024 Nov 27, 2023

Choose a reason for hiding this comment

CabinfeverB left a comment

Choose a reason for hiding this comment

CabinfeverB Nov 27, 2023

Choose a reason for hiding this comment

rleungx commented Nov 27, 2023

ti-chi-bot bot commented Nov 27, 2023

ti-chi-bot bot commented Nov 27, 2023

ti-chi-bot bot commented Nov 27, 2023

ti-chi-bot bot commented Nov 22, 2023 •

edited

codecov bot commented Nov 22, 2023 •

edited