client/http: add more API for lightning's usage, and don't use body io.Reader #7534

lance6716 · 2023-12-12T08:04:37Z

What problem does this PR solve?

Issue Number: ref #7300

What is changed and how does it work?

add HTTP client API for lightning's using (BR not included)
port pdutil: fix retry reusing body reader pingcap/tidb#48312

Check List

Tests

Unit test

Code changes

Has HTTP API interfaces changed (Don't forget to add the declarative for the new API)

Side effects

Related changes

PR to update pingcap/docs/pingcap/docs-cn:
PR to update pingcap/tiup:
Need to cherry-pick to the release branch

Release note

None.

Signed-off-by: lance6716 <[email protected]>

ti-chi-bot · 2023-12-12T08:04:39Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

JmPotato
rleungx

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-12-12T08:14:53Z

Codecov Report

Merging #7534 (58aee20) into master (1eed494) will increase coverage by 0.16%.
Report is 2 commits behind head on master.
The diff coverage is 83.33%.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #7534      +/-   ##
==========================================
+ Coverage   74.48%   74.64%   +0.16%     
==========================================
  Files         453      454       +1     
  Lines       50079    50142      +63     
==========================================
+ Hits        37300    37428     +128     
+ Misses       9439     9382      -57     
+ Partials     3340     3332       -8

Flag	Coverage Δ
unittests	`74.64% <83.33%> (+0.16%)`	⬆️

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

lance6716 · 2023-12-12T08:27:23Z

/auto-cc

JmPotato · 2023-12-12T09:12:29Z

client/http/client.go

@@ -271,7 +275,7 @@ func (c *client) request(
 		zap.String("caller-id", c.callerID),
 	}
 	log.Debug("[pd] request the http url", logFields...)
-	req, err := http.NewRequestWithContext(ctx, method, url, body)
+	req, err := http.NewRequestWithContext(ctx, method, url, bytes.NewBuffer(body))


If body is nil, is it OK to pass it into the bytes.NewBuffer? Should we add a check to use http.NoBody like before?

nil is OK, IDE shows other packages uses bytes.NewBuffer(nil) safely.

rleungx · 2023-12-13T03:11:11Z

client/http/client.go

+}
+
+// PostSchedulerDelay changes the delay of given scheduler.
+func (c *client) PostSchedulerDelay(ctx context.Context, scheduler string, delaySec int64) error {


Do we need tests for these two interfaces?

Sorry currently I don't know how to create the scheduler in http client tests so they can not be covered.

It will be available at https://github.com/tikv/pd/pull/7516/files#diff-138f7d23a1171f829bb57a7edcd66e8ac0ceb81f1cb2f28e497284c732aaad22R67.

I can wait #7516 merge first and then add a test covering these new functions. @rleungx please help review that PR

updated. PTAL

Signed-off-by: lance6716 <[email protected]>

JmPotato · 2023-12-13T07:03:06Z

client/http/client.go

@@ -44,6 +44,7 @@ const (
 // Client is a PD (Placement Driver) HTTP client.
 type Client interface {
 	/* Meta-related interfaces */
+	GetClusterVersion(context.Context) (string, error)


Maybe it's better to move it into the config-related section.

JmPotato · 2023-12-13T07:03:16Z

client/http/client.go

@@ -65,6 +67,7 @@ type Client interface {
 	/* Scheduler-related interfaces */
 	GetSchedulers(context.Context) ([]string, error)
 	CreateScheduler(ctx context.Context, name string, storeID uint64) error
+	PostSchedulerDelay(context.Context, string, int64) error


Suggested change

PostSchedulerDelay(context.Context, string, int64) error

SetSchedulerDelay(context.Context, string, int64) error

Signed-off-by: lance6716 <[email protected]>

lance6716 · 2023-12-13T08:26:09Z

/merge

ti-chi-bot · 2023-12-13T08:26:11Z

@lance6716: 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-12-13T08:26:12Z

@lance6716: /merge is only allowed for the committers, you can assign this pull request to the committer in list by filling /assign @committer in the comment to help merge this pull request.

In response to this:

/merge

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.

lance6716 · 2023-12-13T08:29:56Z

/assign @JmPotato @rleungx

please help merge it

JmPotato · 2023-12-13T08:30:31Z

/merge

ti-chi-bot · 2023-12-13T08:30:33Z

@JmPotato: 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-12-13T08:30:34Z

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

Commit hash: c89be3a

lance6716 · 2023-12-13T08:48:11Z

/build

lance6716 · 2023-12-13T08:48:56Z

/retest

ti-chi-bot · 2023-12-13T09:30:30Z

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

http: add more API for lightning's usage, and don't use body io.Reader

b499e25

Signed-off-by: lance6716 <[email protected]>

ti-chi-bot bot added do-not-merge/needs-linked-issue release-note-none Denotes a PR that doesn't merit a release note. labels Dec 12, 2023

ti-chi-bot bot requested review from HunDunDM and JmPotato December 12, 2023 08:04

ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed do-not-merge/needs-linked-issue labels Dec 12, 2023

ti-chi-bot bot requested review from nolouch and rleungx December 12, 2023 08:27

JmPotato reviewed Dec 12, 2023

View reviewed changes

lance6716 changed the title ~~http: add more API for lightning's usage, and don't use body io.Reader~~ client/http: add more API for lightning's usage, and don't use body io.Reader Dec 12, 2023

JmPotato approved these changes Dec 13, 2023

View reviewed changes

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

rleungx reviewed Dec 13, 2023

View reviewed changes

lance6716 added 2 commits December 13, 2023 14:45

Merge branch 'master' of github.com:tikv/pd into add-api-for-lightning

9202b58

Signed-off-by: lance6716 <[email protected]>

add test

271f966

Signed-off-by: lance6716 <[email protected]>

JmPotato reviewed Dec 13, 2023

View reviewed changes

address comment

c89be3a

Signed-off-by: lance6716 <[email protected]>

rleungx approved these changes Dec 13, 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 Dec 13, 2023

ti-chi-bot bot assigned JmPotato and rleungx Dec 13, 2023

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

Merge branch 'master' into add-api-for-lightning

6cee8bb

Merge branch 'master' into add-api-for-lightning

58aee20

ti-chi-bot bot merged commit e26a4f7 into tikv:master Dec 13, 2023
26 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

client/http: add more API for lightning's usage, and don't use body io.Reader #7534

client/http: add more API for lightning's usage, and don't use body io.Reader #7534

lance6716 commented Dec 12, 2023 •

edited

Loading

ti-chi-bot bot commented Dec 12, 2023 •

edited

Loading

codecov bot commented Dec 12, 2023 •

edited

Loading

lance6716 commented Dec 12, 2023

JmPotato Dec 12, 2023

lance6716 Dec 12, 2023

rleungx Dec 13, 2023

lance6716 Dec 13, 2023

JmPotato Dec 13, 2023

lance6716 Dec 13, 2023

lance6716 Dec 13, 2023

JmPotato Dec 13, 2023

JmPotato Dec 13, 2023

lance6716 commented Dec 13, 2023

ti-chi-bot bot commented Dec 13, 2023

ti-chi-bot bot commented Dec 13, 2023

lance6716 commented Dec 13, 2023

JmPotato commented Dec 13, 2023

ti-chi-bot bot commented Dec 13, 2023

ti-chi-bot bot commented Dec 13, 2023

lance6716 commented Dec 13, 2023

lance6716 commented Dec 13, 2023

ti-chi-bot bot commented Dec 13, 2023

	PostSchedulerDelay(context.Context, string, int64) error
	SetSchedulerDelay(context.Context, string, int64) error

client/http: add more API for lightning's usage, and don't use body io.Reader #7534

client/http: add more API for lightning's usage, and don't use body io.Reader #7534

Conversation

lance6716 commented Dec 12, 2023 • edited Loading

What problem does this PR solve?

What is changed and how does it work?

Check List

Release note

ti-chi-bot bot commented Dec 12, 2023 • edited Loading

codecov bot commented Dec 12, 2023 • edited Loading

Codecov Report

lance6716 commented Dec 12, 2023

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

lance6716 commented Dec 13, 2023

ti-chi-bot bot commented Dec 13, 2023

ti-chi-bot bot commented Dec 13, 2023

lance6716 commented Dec 13, 2023

JmPotato commented Dec 13, 2023

ti-chi-bot bot commented Dec 13, 2023

ti-chi-bot bot commented Dec 13, 2023

lance6716 commented Dec 13, 2023

lance6716 commented Dec 13, 2023

ti-chi-bot bot commented Dec 13, 2023

lance6716 commented Dec 12, 2023 •

edited

Loading

ti-chi-bot bot commented Dec 12, 2023 •

edited

Loading

codecov bot commented Dec 12, 2023 •

edited

Loading