mcs: remove wait api service ready #8476

rleungx · 2024-08-01T07:29:45Z

What problem does this PR solve?

Issue Number: ref #8477

What is changed and how does it work?

To support dynamically switching TSO, we must utilize the service discovery to decide who is responsible for serving TSO requests. However, the current implementation will register the TSO service until the API server is ready to serve. So there must be at least one switch when we use ms mode to start the cluster.

Check List

Tests

Unit test

Release note

None.

lhy1024 · 2024-08-02T02:58:14Z

pkg/mcs/resourcemanager/server/server.go

 	return s.startServer()
 }

+func (s *Server) Register() error {


these Register are similar, could we merge them?

lhy1024 · 2024-08-02T02:59:28Z

pkg/mcs/resourcemanager/server/server.go

@@ -103,21 +105,49 @@ func (s *Server) SetLogLevel(level string) error {

 // Run runs the Resource Manager server.
 func (s *Server) Run() (err error) {
-	skipWaitAPIServiceReady := false


Will removing affect serverless? I am not sure either.

InitClusterID now will retry until the etcd can provide the service.

codecov · 2024-08-05T09:33:49Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 77.41%. Comparing base (3f32f54) to head (059b18e).

Additional details and impacted files

@@           Coverage Diff            @@
##           master    #8476    +/-   ##
========================================
  Coverage   77.40%   77.41%            
========================================
  Files         472      472            
  Lines       61821    61515   -306     
========================================
- Hits        47854    47620   -234     
+ Misses      10400    10360    -40     
+ Partials     3567     3535    -32

lhy1024 · 2024-08-06T03:14:04Z

pkg/mcs/scheduling/server/config/config.go

@@ -34,7 +34,7 @@ import (
 	"github.com/tikv/pd/pkg/cache"
 	"github.com/tikv/pd/pkg/core/constant"
 	"github.com/tikv/pd/pkg/core/storelimit"
-	"github.com/tikv/pd/pkg/mcs/utils"
+	mcsconstat "github.com/tikv/pd/pkg/mcs/utils/constant"


Suggested change

mcsconstat "github.com/tikv/pd/pkg/mcs/utils/constant"

mcsconstant "github.com/tikv/pd/pkg/mcs/utils/constant"

lhy1024 · 2024-08-06T03:17:53Z

tests/integrations/mcs/discovery/register_test.go

@@ -113,9 +113,7 @@ func (suite *serverRegisterTestSuite) checkServerRegister(serviceName string) {
 }

 func (suite *serverRegisterTestSuite) TestServerPrimaryChange() {
-	suite.checkServerPrimaryChange(utils.TSOServiceName, 3)
-	// TODO: uncomment after resource-manager is ready


remove this comment?

lhy1024 · 2024-08-06T03:43:33Z

pkg/mcs/utils/util.go

 			return clusterID, nil
 		}
 		select {
 		case <-ctx.Done():
 			return 0, err
 		case <-ticker.C:
+			retryTimes++


It will print the log every 250s until it succeeds?

same as previous

okJiang · 2024-08-06T09:05:35Z

pkg/mcs/resourcemanager/server/server.go

 	}
-	if err := utils.InitClient(s); err != nil {
+
+	// register


This is a meaningless comment. We can remove it

okJiang · 2024-08-06T09:07:42Z

pkg/mcs/scheduling/server/server.go

 	}

-	if err := utils.InitClient(s); err != nil {
+	// register


okJiang · 2024-08-06T09:09:04Z

pkg/mcs/server/server.go

@@ -100,6 +100,11 @@ func (bs *BaseServer) SetETCDClient(etcdClient *clientv3.Client) {
 	bs.etcdClient = etcdClient
 }

+// SetETCDClient sets the etcd client.


typo

Suggested change

// SetETCDClient sets the etcd client.

// GetETCDClient gets the etcd client.

okJiang · 2024-08-06T09:09:24Z

pkg/mcs/tso/server/server.go

 		return err
 	}
+
+	// register


okJiang · 2024-08-06T09:22:40Z

pkg/mcs/utils/util.go

@@ -330,6 +278,41 @@ func StopGRPCServer(s server) {
 	}
 }

+func Register(s server, serviceName string) (uint64, *discovery.ServiceRegistryEntry, *discovery.ServiceRegister, error) {


Please add some comments for it

okJiang · 2024-08-06T09:46:15Z

pkg/mcs/utils/util.go

Most of the content in the file is related to the server. Maybe we can rename the file, or later move the server-related parts to server.go.

okJiang

Please fix the conflict

ti-chi-bot · 2024-08-07T02:35:07Z

[LGTM Timeline notifier]

Timeline:

2024-08-06 06:11:00.69259285 +0000 UTC m=+332390.559691939: ☑️ agreed by lhy1024.
2024-08-07 02:35:06.241581064 +0000 UTC m=+405836.108680149: ☑️ agreed by okJiang.

rleungx · 2024-08-07T09:01:15Z

/cc @niubell

ti-chi-bot · 2024-08-07T09:01:17Z

@rleungx: GitHub didn't allow me to request PR reviews from the following users: niubell.

Note that only tikv members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/cc @niubell

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.

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

ti-chi-bot · 2024-08-12T07:24:07Z

[APPROVALNOTIFIER] This PR is APPROVED

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

~~OWNERS~~ [JmPotato,lhy1024]
~~pkg/mcs/resourcemanager/server/OWNERS~~ [niubell]
~~pkg/mcs/scheduling/server/config/OWNERS~~ [niubell]
~~pkg/mcs/tso/server/OWNERS~~ [niubell]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

lhy1024 reviewed Aug 2, 2024

View reviewed changes

ti-chi-bot bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 2, 2024

rleungx force-pushed the remove-wait-api branch from 5e9905d to 4cb4135 Compare August 5, 2024 04:33

ti-chi-bot bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Aug 5, 2024

rleungx force-pushed the remove-wait-api branch from 9940598 to 08ac9e7 Compare August 5, 2024 08:31

lhy1024 reviewed Aug 6, 2024

View reviewed changes

lhy1024 approved these changes Aug 6, 2024

View reviewed changes

ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Aug 6, 2024

rleungx requested a review from JmPotato August 6, 2024 07:34

okJiang reviewed Aug 6, 2024

View reviewed changes

okJiang approved these changes Aug 7, 2024

View reviewed changes

ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Aug 7, 2024

rleungx force-pushed the remove-wait-api branch from d3c700b to fa0e332 Compare August 7, 2024 06:25

JmPotato approved these changes Aug 8, 2024

View reviewed changes

ti-chi-bot bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 10, 2024

rleungx force-pushed the remove-wait-api branch from 209129b to e63eb93 Compare August 12, 2024 02:48

ti-chi-bot bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 12, 2024

rleungx mentioned this pull request Aug 12, 2024

*: unify the usage of independent service #8508

Merged

ti-chi-bot bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 12, 2024

rleungx added 6 commits August 12, 2024 14:55

remove wait api service ready

ce4bc1c

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

remove function

bbdf280

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

fix

67e2d64

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

fix

064e8f7

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

typo

01372dc

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

address the comment

059b18e

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

rleungx force-pushed the remove-wait-api branch from e63eb93 to 059b18e Compare August 12, 2024 06:57

ti-chi-bot bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 12, 2024

niubell approved these changes Aug 12, 2024

View reviewed changes

ti-chi-bot bot added the approved label Aug 12, 2024

ti-chi-bot bot merged commit f3602e3 into tikv:master Aug 12, 2024
25 checks passed

rleungx deleted the remove-wait-api branch August 12, 2024 07:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

mcs: remove wait api service ready #8476

mcs: remove wait api service ready #8476

rleungx commented Aug 1, 2024 •

edited

Loading

lhy1024 Aug 2, 2024

lhy1024 Aug 2, 2024

rleungx Aug 5, 2024

codecov bot commented Aug 5, 2024 •

edited

Loading

lhy1024 Aug 6, 2024

lhy1024 Aug 6, 2024

rleungx Aug 6, 2024

lhy1024 Aug 6, 2024

rleungx Aug 6, 2024

okJiang Aug 6, 2024

okJiang Aug 6, 2024

okJiang Aug 6, 2024

okJiang Aug 6, 2024

okJiang Aug 6, 2024

okJiang Aug 6, 2024

okJiang left a comment

ti-chi-bot bot commented Aug 7, 2024

rleungx commented Aug 7, 2024

ti-chi-bot bot commented Aug 7, 2024

ti-chi-bot bot commented Aug 12, 2024

	mcsconstat "github.com/tikv/pd/pkg/mcs/utils/constant"
	mcsconstant "github.com/tikv/pd/pkg/mcs/utils/constant"

	// SetETCDClient sets the etcd client.
	// GetETCDClient gets the etcd client.

mcs: remove wait api service ready #8476

mcs: remove wait api service ready #8476

Conversation

rleungx commented Aug 1, 2024 • edited Loading

What problem does this PR solve?

What is changed and how does it work?

Check List

Release note

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Aug 5, 2024 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

okJiang left a comment

Choose a reason for hiding this comment

ti-chi-bot bot commented Aug 7, 2024

[LGTM Timeline notifier]

rleungx commented Aug 7, 2024

ti-chi-bot bot commented Aug 7, 2024

ti-chi-bot bot commented Aug 12, 2024

rleungx commented Aug 1, 2024 •

edited

Loading

codecov bot commented Aug 5, 2024 •

edited

Loading