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

*: fix missing calls to .Error() (#2870) #2874

Merged
merged 5 commits into from
Sep 1, 2020
Merged

*: fix missing calls to .Error() (#2870) #2874

merged 5 commits into from
Sep 1, 2020

Conversation

ti-srebot
Copy link
Contributor

cherry-pick #2870 to release-4.0

Signed-off-by: Howard Lau howardlau1999@hotmail.com

What problem does this PR solve?

We should call .Error to convert error to string, otherwise we will get an empty result.

What is changed and how it works?

Add missing .Error() call for API error responses.

Check List

Tests

  • No test

Release note

  • No release note

@howardlau1999 @ti-srebot
cherry pick tikv#2870 to release-4.0
a9f13be 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Sep 1, 2020
Merged
@ti-srebot ti-srebot added status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick labels Sep 1, 2020
@ti-srebot ti-srebot added this to the 4.0.5 milestone Sep 1, 2020
@ti-srebot
Copy link
Contributor Author

@howardlau1999 please accept the invitation then you can push to the cherry-pick pull requests.
https://github.com/ti-srebot/pd/invitations

@ti-srebot ti-srebot added status/LGT1 Indicates that a PR has LGTM 1. and removed status/LGT2 Indicates that a PR has LGTM 2. labels Sep 1, 2020
@lhy1024
Copy link
Contributor

lhy1024 commented Sep 1, 2020

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 1, 2020
@lhy1024 lhy1024 modified the milestones: 4.0.5, v4.0.6 Sep 1, 2020
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@codecov
Copy link

codecov bot commented Sep 1, 2020 •
edited
Loading

Codecov Report

Merging #2874 into release-4.0 will decrease coverage by 0.03%.
The diff coverage is 0.00%.

Impacted file tree graph

@@               Coverage Diff               @@
##           release-4.0    #2874      +/-   ##
===============================================
- Coverage        77.42%   77.39%   -0.04%     
===============================================
  Files              208      208              
  Lines            22762    22762              
===============================================
- Hits             17624    17617       -7     
- Misses            3812     3817       +5     
- Partials          1326     1328       +2
Impacted Files Coverage Δ
server/api/label.go 86.66% <0.00%> (ø)
server/api/scheduler.go 41.80% <0.00%> (ø)
server/api/store.go 66.23% <0.00%> (ø)
server/kv/etcd_kv.go 75.32% <0.00%> (-9.10%) ⬇️
server/tso/tso.go 78.48% <0.00%> (-3.17%) ⬇️
server/core/storage.go 73.43% <0.00%> (-0.79%) ⬇️
client/base_client.go 90.60% <0.00%> (-0.68%) ⬇️
server/member/leader.go 72.37% <0.00%> (-0.39%) ⬇️
server/cluster/cluster.go 80.91% <0.00%> (-0.21%) ⬇️
server/server.go 77.11% <0.00%> (-0.15%) ⬇️
... and 5 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ceef517...d85b573. Read the comment docs.

@lhy1024
Copy link
Contributor

lhy1024 commented Sep 1, 2020

/run-all-tests

@lhy1024
Copy link
Contributor

lhy1024 commented Sep 1, 2020

/merge

@ti-srebot
Copy link
Contributor Author

Your auto merge job has been accepted, waiting for:

  • 2871

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@lhy1024
Copy link
Contributor

lhy1024 commented Sep 1, 2020

/merge

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@lhy1024
Copy link
Contributor

lhy1024 commented Sep 1, 2020

/merge

2 similar comments
@lhy1024
Copy link
Contributor

lhy1024 commented Sep 1, 2020

/merge

@lhy1024
Copy link
Contributor

lhy1024 commented Sep 1, 2020

/merge

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@ti-srebot ti-srebot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Sep 1, 2020
@howardlau1999
Copy link
Contributor

/merge

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@lhy1024
Copy link
Contributor

lhy1024 commented Sep 1, 2020

/merge

@ti-srebot
Copy link
Contributor Author

Your auto merge job has been accepted, waiting for:

  • 2871

@lhy1024 lhy1024 closed this Sep 1, 2020
@lhy1024 lhy1024 reopened this Sep 1, 2020
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@lhy1024
Copy link
Contributor

lhy1024 commented Sep 1, 2020

/run-all-tests

@lhy1024
Copy link
Contributor

lhy1024 commented Sep 1, 2020

/run-all-tests

@lhy1024
Copy link
Contributor

lhy1024 commented Sep 1, 2020

/run-all-tests

@nolouch nolouch merged commit 034295c into tikv:release-4.0 Sep 1, 2020
This was referenced Sep 10, 2020
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lhy1024 lhy1024 lhy1024 approved these changes

@HunDunDM HunDunDM HunDunDM approved these changes

@nolouch nolouch Awaiting requested review from nolouch

Assignees
No one assigned
Labels
status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Milestone
v4.0.6
Development

Successfully merging this pull request may close these issues.
5 participants
@ti-srebot @lhy1024 @howardlau1999 @HunDunDM @nolouch