api: use suitable status code and make TestResetTS stable #7368

lhy1024 · 2023-11-14T09:38:09Z

What problem does this PR solve?

Issue Number: Close #7411 #7314

What is changed and how does it work?

Check List

Tests

Unit test

Release note

None.

Signed-off-by: lhy1024 <admin@liudos.us>

ti-chi-bot · 2023-11-14T09:38:12Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

CabinfeverB
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-11-14T09:52:31Z

Codecov Report

Merging #7368 (8730e26) into master (f2eaf23) will decrease coverage by 0.01%.
The diff coverage is 0.00%.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #7368      +/-   ##
==========================================
- Coverage   74.28%   74.28%   -0.01%     
==========================================
  Files         451      451              
  Lines       48899    48905       +6     
==========================================
+ Hits        36327    36331       +4     
- Misses       9348     9358      +10     
+ Partials     3224     3216       -8

Flag	Coverage Δ
unittests	`74.28% <0.00%> (-0.01%)`	⬇️

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

rleungx · 2023-11-15T03:10:37Z

Please add some explanation of the reason for this unstable test.

lhy1024 · 2023-11-15T03:20:24Z

Please add some explanation of the reason for this unstable test.

When we call ResetTS, we may meet etcd transaction conflict.

rleungx · 2023-11-15T04:14:41Z

server/api/admin_test.go

+ case http.StatusOK:
+ re.Contains(string(b), "Reset ts successfully.")
+ return true
+ case http.StatusForbidden:


The status code is strange.

replace it with 503

Ref: https://datatracker.ietf.org/doc/html/rfc7231#section-6.6.4

Signed-off-by: lhy1024 <admin@liudos.us>

CabinfeverB · 2023-11-16T07:08:07Z

pkg/mcs/tso/server/apis/v1/api.go

@@ -185,6 +185,11 @@ func ResetTS(c *gin.Context) {
 if err = svr.ResetTS(ts, ignoreSmaller, skipUpperBoundCheck, 0); err != nil {
 if err == errs.ErrServerNotStarted {
 c.String(http.StatusInternalServerError, err.Error())
+ } else if err == errs.ErrEtcdTxnConflict {


This is not only for test? Because it will effect the resp to users.
I want to know whether this PR needs to cherry-pick.

yes, not only for test. But I am not sure whether it is a bug to need cherry-pick.

If it's only for TSO services, IMO we don't need to.

PD mode also returns 403 when meeting ErrEtcdTxnConflict before this PR

BR is using it https://github.com/pingcap/tidb/blob/1f7c1e02bcd402cfbc1a0b0a26acfbd0d0fe4d8c/br/pkg/pdutil/pd.go#L892

After discussion with @niubell, we will only fix it on master branch.

lhy1024 · 2023-11-16T10:41:44Z

/merge

ti-chi-bot · 2023-11-16T10:41:47Z

@lhy1024: 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-16T10:41:49Z

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

Commit hash: 50e0365

Signed-off-by: lhy1024 <admin@liudos.us>

lhy1024 · 2023-11-17T03:42:48Z

/hold

lhy1024 · 2023-11-22T06:43:55Z

After a discussion with @niubell, we will only fix it on the master branch.

lhy1024 · 2023-11-22T06:59:28Z

/merge

ti-chi-bot · 2023-11-22T06:59:31Z

@lhy1024: 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-22T06:59:32Z

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

Commit hash: 8730e26

ti-chi-bot · 2023-11-22T07:33:14Z

@lhy1024: 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#7411 Signed-off-by: lhy1024 <admin@liudos.us> Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>

tests: make TestResetTS stable

1a1e0b7

Signed-off-by: lhy1024 <admin@liudos.us>

ti-chi-bot bot added the release-note-none Denotes a PR that doesn't merit a release note. label Nov 14, 2023

ti-chi-bot bot requested review from JmPotato and nolouch November 14, 2023 09:38

ti-chi-bot bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 14, 2023

rleungx reviewed Nov 15, 2023

View reviewed changes

lhy1024 added 2 commits November 16, 2023 14:13

add status code

7a56c16

Signed-off-by: lhy1024 <admin@liudos.us>

fix status code

871a8d9

Signed-off-by: lhy1024 <admin@liudos.us>

rleungx approved these changes Nov 16, 2023

View reviewed changes

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

add comments

50e0365

Signed-off-by: lhy1024 <admin@liudos.us>

ti-chi-bot bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 16, 2023

CabinfeverB approved these changes Nov 16, 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 16, 2023

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

lhy1024 changed the title ~~tests: make TestResetTS stable~~ api: use suitable status code and make TestResetTS stable Nov 16, 2023

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

add comments

23fa5f0

Signed-off-by: lhy1024 <admin@liudos.us>

lhy1024 force-pushed the fix-test15 branch from 63aa2f8 to 23fa5f0 Compare November 16, 2023 11:00

Merge branch 'master' into fix-test15

8730e26

ti-chi-bot bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 17, 2023

lhy1024 removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 22, 2023

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

ti-chi-bot bot added 2 commits November 22, 2023 06:59

Merge branch 'master' into fix-test15

d4c9778

Merge branch 'master' into fix-test15

3db09f6

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

lhy1024 mentioned this pull request Nov 22, 2023

TestResetTS is unstable #7314

Closed

rleungx mentioned this pull request Nov 30, 2023

Separate scheduling into an independent service #5839

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

api: use suitable status code and make TestResetTS stable #7368

api: use suitable status code and make TestResetTS stable #7368

lhy1024 commented Nov 14, 2023 •

edited

Loading

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

edited

Loading

codecov bot commented Nov 14, 2023 •

edited

Loading

rleungx commented Nov 15, 2023

lhy1024 commented Nov 15, 2023

rleungx Nov 15, 2023

lhy1024 Nov 16, 2023

lhy1024 Nov 16, 2023

CabinfeverB Nov 16, 2023

lhy1024 Nov 16, 2023

rleungx Nov 16, 2023

lhy1024 Nov 16, 2023 •

edited

Loading

lhy1024 Nov 17, 2023

lhy1024 Nov 22, 2023

lhy1024 commented Nov 16, 2023

ti-chi-bot bot commented Nov 16, 2023

ti-chi-bot bot commented Nov 16, 2023

lhy1024 commented Nov 17, 2023

lhy1024 commented Nov 22, 2023

lhy1024 commented Nov 22, 2023

ti-chi-bot bot commented Nov 22, 2023

ti-chi-bot bot commented Nov 22, 2023

ti-chi-bot bot commented Nov 22, 2023

api: use suitable status code and make TestResetTS stable #7368

api: use suitable status code and make TestResetTS stable #7368

Conversation

lhy1024 commented Nov 14, 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 Nov 14, 2023 • edited Loading

codecov bot commented Nov 14, 2023 • edited Loading

Codecov Report

rleungx commented Nov 15, 2023

lhy1024 commented Nov 15, 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

lhy1024 Nov 16, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lhy1024 commented Nov 16, 2023

ti-chi-bot bot commented Nov 16, 2023

ti-chi-bot bot commented Nov 16, 2023

lhy1024 commented Nov 17, 2023

lhy1024 commented Nov 22, 2023

lhy1024 commented Nov 22, 2023

ti-chi-bot bot commented Nov 22, 2023

ti-chi-bot bot commented Nov 22, 2023

ti-chi-bot bot commented Nov 22, 2023

lhy1024 commented Nov 14, 2023 •

edited

Loading

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

edited

Loading

codecov bot commented Nov 14, 2023 •

edited

Loading

lhy1024 Nov 16, 2023 •

edited

Loading