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

*: remove api mode #8780

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

*: remove api mode #8780

wants to merge 9 commits into from
+504 −509

Conversation

rleungx
Copy link
Member

@rleungx rleungx commented Nov 6, 2024 •
edited
Loading

What problem does this PR solve?

Issue Number: ref #8477.

What is changed and how does it work?

Check List

Tests

  • Unit test

Release note

None.

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

ti-chi-bot bot commented Nov 6, 2024

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 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. dco-signoff: yes Indicates the PR's author has signed the dco. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 6, 2024
@rleungx rleungx force-pushed the remove-api-mode branch 2 times, most recently from baece73 to e252d4c Compare November 7, 2024 03:33
@ti-chi-bot ti-chi-bot bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 12, 2024
@codecov Codecov
Copy link

codecov bot commented Nov 28, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 81.52174% with 17 lines in your changes missing coverage. Please review.

Project coverage is 76.38%. Comparing base (75cdec4) to head (00f2840).
Report is 1099 commits behind head on master.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #8780      +/-   ##
==========================================
+ Coverage   74.91%   76.38%   +1.47%     
==========================================
  Files         416      465      +49     
  Lines       42103    70544   +28441     
==========================================
+ Hits        31543    53888   +22345     
- Misses       7810    13315    +5505     
- Partials     2750     3341     +591
Flag Coverage Δ
unittests 76.38% <81.52%> (+1.47%) ⬆️

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

@rleungx rleungx marked this pull request as ready for review November 29, 2024 09:33
@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 Nov 29, 2024
okJiang
okJiang reviewed Dec 9, 2024
View reviewed changes
Copy link
Member

@okJiang okJiang left a comment

Choose a reason for hiding this comment

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

Is there any test results?

okJiang
okJiang reviewed Dec 9, 2024
View reviewed changes
Copy link
Member

@okJiang okJiang left a comment

Choose a reason for hiding this comment

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

Please add some description about these changes.

server/server.go Outdated
if err := s.member.CampaignLeader(s.ctx, s.cfg.LeaderLease); err != nil {
if err.Error() == errs.ErrEtcdTxnConflict.Error() {
log.Info(fmt.Sprintf("campaign %s leader meets error due to txn conflict, another PD/API server may campaign successfully", s.mode),
log.Info("campaign %PD leader meets error due to txn conflict, another PD/API server may campaign successfully",
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
log.Info("campaign %PD leader meets error due to txn conflict, another PD/API server may campaign successfully",
log.Info("campaign PD leader meets error due to txn conflict, another PD/API server may campaign successfully",

@rleungx rleungx requested a review from lhy1024 December 26, 2024 09:32
lhy1024
lhy1024 reviewed Jan 8, 2025
View reviewed changes
server/apiv2/handlers/micro_service.go
@@ -39,11 +39,6 @@ func RegisterMicroService(r *gin.RouterGroup) {
// @Router /ms/members/{service} [get]
func GetMembers(c *gin.Context) {
svr := c.MustGet(middlewares.ServerContextKey).(*server.Server)
if !svr.IsPDServiceMode() {
Copy link
Contributor

Choose a reason for hiding this comment

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

If access pd mode server, will it return 500?

Copy link
Member Author

Choose a reason for hiding this comment

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

After this PR, there won't be pd mode anymore.

server/cluster/cluster.go Outdated
}
} else {
servers, err := discovery.Discover(c.etcdClient, constant.SchedulingServiceName)
if c.opt.GetMicroServiceConfig().IsSchedulingFallbackEnabled() && (err != nil || len(servers) == 0) {
Copy link
Contributor

Choose a reason for hiding this comment

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

If SchedulingFallbackEnabled is false and there is no scheduling server, will we not try to start scheduling service in pd server?

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

ti-chi-bot bot commented Jan 8, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from rleungx and additionally assign niubell for approval(Please ensuring that each of them provides their approval before proceeding). For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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 added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jan 8, 2025
rleungx added 3 commits January 9, 2025 10:57
@rleungx
remove api mode
92c2556 
Signed-off-by: Ryan Leung <[email protected]>
@rleungx
fix conflicts
6b1a976 
Signed-off-by: Ryan Leung <[email protected]>
@rleungx
rename
3322432 
Signed-off-by: Ryan Leung <[email protected]>
rleungx added 3 commits January 9, 2025 10:57
@rleungx
fix
40d3e74 
Signed-off-by: Ryan Leung <[email protected]>
@rleungx
fix
90407fa 
Signed-off-by: Ryan Leung <[email protected]>
@rleungx
remove api mode
fc2e1bd 
Signed-off-by: Ryan Leung <[email protected]>
rleungx added 3 commits January 9, 2025 11:03
@rleungx
fix
323fbae 
Signed-off-by: Ryan Leung <[email protected]>
@rleungx
fix
29de7b3 
Signed-off-by: Ryan Leung <[email protected]>
@rleungx
fix
00f2840 
Signed-off-by: Ryan Leung <[email protected]>
@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jan 9, 2025

@rleungx: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-integration-realcluster-test 00f2840 link true /test pull-integration-realcluster-test

Full PR test history. Your PR dashboard.

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-sigs/prow repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@okJiang okJiang okJiang left review comments

@lhy1024 lhy1024 lhy1024 left review comments

Assignees
No one assigned
Labels
dco-signoff: yes Indicates the PR's author has signed the dco. release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@rleungx @lhy1024 @okJiang