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 empty http response in scheduler (#2869) #2871

Merged
merged 5 commits into from
Sep 1, 2020
Merged

fix empty http response in scheduler (#2869) #2871

merged 5 commits into from
Sep 1, 2020

Conversation

ti-srebot
Copy link
Contributor

cherry-pick #2869 to release-4.0

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

What problem does this PR solve?

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

Check List

Tests

  • Unit test

Release note

@lhy1024 @ti-srebot
cherry pick tikv#2869 to release-4.0
19ca268 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Aug 31, 2020
Merged
@ti-srebot ti-srebot added require-LGT1 Indicates that the PR requires an LGTM. status/LGT1 Indicates that a PR has LGTM 1. type/cherry-pick labels Aug 31, 2020
@ti-srebot ti-srebot requested a review from rleungx August 31, 2020 12:10
@ti-srebot ti-srebot added this to the 4.0.5 milestone Aug 31, 2020
@lhy1024
fix conflict
2644682 
Signed-off-by: lhy1024 <admin@liudos.us>
@lhy1024
fix conflict
48b78af 
Signed-off-by: lhy1024 <admin@liudos.us>
@codecov
Copy link

codecov bot commented Aug 31, 2020 •
edited
Loading

Codecov Report

Merging #2871 into release-4.0 will decrease coverage by 0.17%.
The diff coverage is 14.28%.

Impacted file tree graph

@@               Coverage Diff               @@
##           release-4.0    #2871      +/-   ##
===============================================
- Coverage        77.47%   77.29%   -0.18%     
===============================================
  Files              208      208              
  Lines            22762    22762              
===============================================
- Hits             17635    17595      -40     
- Misses            3805     3844      +39     
- Partials          1322     1323       +1
Impacted Files Coverage Δ
server/schedulers/scatter_range.go 83.01% <0.00%> (ø)
server/schedulers/evict_leader.go 72.24% <16.66%> (ø)
server/schedulers/grant_leader.go 71.66% <16.66%> (ø)
server/kv/etcd_kv.go 75.32% <0.00%> (-12.99%) ⬇️
server/cluster/coordinator.go 63.30% <0.00%> (-6.72%) ⬇️
server/heartbeat_streams.go 68.00% <0.00%> (-6.00%) ⬇️
server/tso/tso.go 82.27% <0.00%> (-0.64%) ⬇️
server/grpc_service.go 60.46% <0.00%> (-0.20%) ⬇️
pkg/etcdutil/etcdutil.go 88.40% <0.00%> (ø)
server/member/leader.go 73.54% <0.00%> (+2.33%) ⬆️

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 6403e70...9ae4620. Read the comment docs.

@rleungx rleungx modified the milestones: 4.0.5, v4.0.6 Sep 1, 2020
@lhy1024
Copy link
Contributor

lhy1024 commented Sep 1, 2020

/run-all-tests

@nolouch
Copy link
Contributor

nolouch commented Sep 1, 2020

LGTM

@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
@nolouch
Copy link
Contributor

nolouch 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
@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

1 similar comment
@lhy1024
Copy link
Contributor

lhy1024 commented Sep 1, 2020

/merge

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

@lhy1024
Copy link
Contributor

lhy1024 commented Sep 1, 2020

/merge

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

rleungx
rleungx approved these changes Sep 1, 2020
View reviewed changes
Copy link
Member

@rleungx rleungx left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-srebot ti-srebot added status/LGT3 The PR has already had 3 LGTM. and removed status/LGT2 Indicates that a PR has LGTM 2. labels Sep 1, 2020
@rleungx
Copy link
Member

rleungx commented Sep 1, 2020

/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:

  • 2874

@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

@lhy1024
Copy link
Contributor

lhy1024 commented Sep 1, 2020

/run-all-tests

1 similar comment
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@lhy1024 lhy1024 merged commit 00920b6 into tikv:release-4.0 Sep 1, 2020
@lhy1024 lhy1024 deleted the release-4.0-3e3174475335 branch September 1, 2020 08:03
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

@rleungx rleungx rleungx approved these changes

Assignees

@lhy1024 lhy1024

Labels
require-LGT1 Indicates that the PR requires an LGTM. status/can-merge Indicates a PR has been approved by a committer. status/LGT3 The PR has already had 3 LGTM.
Projects
None yet
Milestone
v4.0.6
Development

Successfully merging this pull request may close these issues.
4 participants
@ti-srebot @lhy1024 @nolouch @rleungx