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

server: Refine log error format (#2873) #2911

Merged
merged 12 commits into from
Sep 7, 2020
Merged

server: Refine log error format (#2873) #2911

merged 12 commits into from
Sep 7, 2020
+51 −47

Conversation

ti-srebot
Copy link
Contributor

cherry-pick #2873 to release-4.0

Signed-off-by: ZenoTan zenotan1998@gmail.com

What problem does this PR solve?

Refine log format in package server. Solve #2704

What is changed and how it works?

log.Error and errors.Errorf parts are changed

Check List

Tests

  • No code

Code changes

  • Has log error change

Release note

  • No release note

@ZenoTan @ti-srebot
cherry pick tikv#2873 to release-4.0
28c0f6d 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Sep 7, 2020
Merged
@ti-srebot ti-srebot added contribution This PR is from a community contributor. status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick labels Sep 7, 2020
@ti-srebot ti-srebot added this to the v4.0.6 milestone Sep 7, 2020
@ti-srebot
Copy link
Contributor Author

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

lhy1024
lhy1024 reviewed Sep 7, 2020
View reviewed changes
Copy link
Contributor

@lhy1024 lhy1024 left a comment

Choose a reason for hiding this comment

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

plz fix

@ZenoTan ZenoTan force-pushed the release-4.0-12a08b130644 branch from 79ba4b9 to 4a20d66 Compare September 7, 2020 08:57
ZenoTan and others added 6 commits September 7, 2020 16:57
@ZenoTan
Update errno.go
4a20d66 
Signed-off-by: ZenoTan <zenotan1998@gmail.com>
@ZenoTan
Merge branch 'release-4.0' into release-4.0-12a08b130644
7df02b4
@ZenoTan
Server log
a84b5ee 
Signed-off-by: ZenoTan <zenotan1998@gmail.com>
@ZenoTan
Import
448f938 
Signed-off-by: ZenoTan <zenotan1998@gmail.com>
@ZenoTan
Merge branch 'release-4.0-12a08b130644' of https://github.com/ti-sreb…
66fa850 
…ot/pd into release

Signed-off-by: ZenoTan <zenotan1998@gmail.com>
@ZenoTan
Merge branch 'release-4.0' into release-4.0-12a08b130644
ca76aeb
@ZenoTan ZenoTan force-pushed the release-4.0-12a08b130644 branch 2 times, most recently from c6897b7 to 2efe415 Compare September 7, 2020 09:47
ZenoTan and others added 2 commits September 7, 2020 17:48
rleungx
rleungx reviewed Sep 7, 2020
View reviewed changes
server/id/id.go Outdated
@@ -14,10 +14,10 @@
package id

import (
"github.com/tikv/pd/pkg/errs"
Copy link
Member

Choose a reason for hiding this comment

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

Please fix it

@codecov
Copy link

codecov bot commented Sep 7, 2020 •
edited
Loading

Codecov Report

Merging #2911 into release-4.0 will increase coverage by 0.08%.
The diff coverage is 67.75%.

Impacted file tree graph

@@               Coverage Diff               @@
##           release-4.0    #2911      +/-   ##
===============================================
+ Coverage        77.16%   77.24%   +0.08%     
===============================================
  Files              204      210       +6     
  Lines            21940    22857     +917     
===============================================
+ Hits             16931    17657     +726     
- Misses            3724     3853     +129     
- Partials          1285     1347      +62
Impacted Files Coverage Δ
client/metrics.go 100.00% <ø> (ø)
pkg/apiutil/apiutil.go 67.34% <ø> (ø)
pkg/apiutil/serverapi/middleware.go 73.07% <0.00%> (ø)
pkg/cache/cache.go 0.00% <ø> (ø)
pkg/cache/fifo.go 100.00% <ø> (ø)
pkg/cache/lru.go 80.35% <ø> (ø)
pkg/cache/two_queue.go 66.66% <ø> (ø)
pkg/codec/codec.go 78.57% <ø> (ø)
pkg/component/manager.go 81.01% <ø> (ø)
pkg/dashboard/adapter/redirector.go 94.23% <ø> (ø)
... and 210 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 10dfed5...b3ba3a4. Read the comment docs.

@ZenoTan
Fix
2326115 
Signed-off-by: ZenoTan <zenotan1998@gmail.com>
@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 7, 2020
@rleungx rleungx added the require-LGT1 Indicates that the PR requires an LGTM. label Sep 7, 2020
@rleungx
Copy link
Member

rleungx commented Sep 7, 2020

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 7, 2020
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot merged commit a1d3230 into tikv:release-4.0 Sep 7, 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

@rleungx rleungx rleungx left review comments

@lhy1024 lhy1024 lhy1024 approved these changes

@nolouch nolouch Awaiting requested review from nolouch

Assignees
No one assigned
Labels
contribution This PR is from a community contributor. require-LGT1 Indicates that the PR requires an LGTM. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1.
Projects
None yet
Milestone
v4.0.6
Development

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