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

Merged
merged 27 commits into from
Sep 4, 2020
Merged

server: Refine log error format #2873

merged 27 commits into from
Sep 4, 2020

Conversation

ZenoTan
Copy link
Contributor

@ZenoTan ZenoTan commented Sep 1, 2020 •
edited by zhouqiang-cl

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
Change server log error
ea7abe9 
Signed-off-by: ZenoTan <zenotan1998@gmail.com>
@ti-srebot ti-srebot added the contribution Indicates that the PR was contributed by an external member. label Sep 1, 2020
@sre-bot
Copy link
Contributor

sre-bot commented Sep 1, 2020

No release note, Please follow https://github.com/pingcap/community/blob/master/contributors/release-note-checker.md

@sre-bot
Copy link
Contributor

sre-bot commented Sep 1, 2020

download pd at http://fileserver.pingcap.net/download/builds/pingcap/pd/pr/ea7abe9da4d4ea0eafa99b4a97a375575c9c34c9/centos7/pd-server.tar.gz

@sre-bot
Copy link
Contributor

sre-bot commented Sep 1, 2020

No release note, Please follow https://github.com/pingcap/community/blob/master/contributors/release-note-checker.md

@sre-bot
Copy link
Contributor

sre-bot commented Sep 1, 2020

download pd at http://fileserver.pingcap.net/download/builds/pingcap/pd/pr/ea7abe9da4d4ea0eafa99b4a97a375575c9c34c9/centos7/pd-server.tar.gz

@sre-bot
Copy link
Contributor

sre-bot commented Sep 1, 2020

No release note, Please follow https://github.com/pingcap/community/blob/master/contributors/release-note-checker.md

@ZenoTan
Add error definitions
f3e7254 
Signed-off-by: ZenoTan <zenotan1998@gmail.com>
@sre-bot
Copy link
Contributor

sre-bot commented Sep 1, 2020

download pd at http://fileserver.pingcap.net/download/builds/pingcap/pd/pr/f3e7254bb3c7b7a0c35855f022fcb98ca33e0fa6/centos7/pd-server.tar.gz

@sre-bot
Copy link
Contributor

sre-bot commented Sep 1, 2020

No release note, Please follow https://github.com/pingcap/community/blob/master/contributors/release-note-checker.md

@sre-bot
Copy link
Contributor

sre-bot commented Sep 1, 2020

download pd at http://fileserver.pingcap.net/download/builds/pingcap/pd/pr/f3e7254bb3c7b7a0c35855f022fcb98ca33e0fa6/centos7/pd-server.tar.gz

@sre-bot
Copy link
Contributor

sre-bot commented Sep 1, 2020

No release note, Please follow https://github.com/pingcap/community/blob/master/contributors/release-note-checker.md

@sre-bot
Copy link
Contributor

sre-bot commented Sep 1, 2020

download pd at http://fileserver.pingcap.net/download/builds/pingcap/pd/pr/f3e7254bb3c7b7a0c35855f022fcb98ca33e0fa6/centos7/pd-server.tar.gz

@sre-bot
Copy link
Contributor

sre-bot commented Sep 1, 2020

No release note, Please follow https://github.com/pingcap/community/blob/master/contributors/release-note-checker.md

@sre-bot
Copy link
Contributor

sre-bot commented Sep 1, 2020

download pd at http://fileserver.pingcap.net/download/builds/pingcap/pd/pr/f3e7254bb3c7b7a0c35855f022fcb98ca33e0fa6/centos7/pd-server.tar.gz

@sre-bot
Copy link
Contributor

sre-bot commented Sep 1, 2020

No release note, Please follow https://github.com/pingcap/community/blob/master/contributors/release-note-checker.md

@sre-bot
Copy link
Contributor

sre-bot commented Sep 1, 2020

download pd at http://fileserver.pingcap.net/download/builds/pingcap/pd/pr/f3e7254bb3c7b7a0c35855f022fcb98ca33e0fa6/centos7/pd-server.tar.gz

@sre-bot
Copy link
Contributor

sre-bot commented Sep 1, 2020

No release note, Please follow https://github.com/pingcap/community/blob/master/contributors/release-note-checker.md

@sre-bot
Copy link
Contributor

sre-bot commented Sep 1, 2020

download pd at http://fileserver.pingcap.net/download/builds/pingcap/pd/pr/f3e7254bb3c7b7a0c35855f022fcb98ca33e0fa6/centos7/pd-server.tar.gz

@sre-bot
Copy link
Contributor

sre-bot commented Sep 1, 2020

No release note, Please follow https://github.com/pingcap/community/blob/master/contributors/release-note-checker.md

@sre-bot
Copy link
Contributor

sre-bot commented Sep 1, 2020

download pd at http://fileserver.pingcap.net/download/builds/pingcap/pd/pr/f3e7254bb3c7b7a0c35855f022fcb98ca33e0fa6/centos7/pd-server.tar.gz

@sre-bot
Copy link
Contributor

sre-bot commented Sep 1, 2020

No release note, Please follow https://github.com/pingcap/community/blob/master/contributors/release-note-checker.md

@sre-bot
Copy link
Contributor

sre-bot commented Sep 1, 2020

download pd at http://fileserver.pingcap.net/download/builds/pingcap/pd/pr/f3e7254bb3c7b7a0c35855f022fcb98ca33e0fa6/centos7/pd-server.tar.gz

@sre-bot
Copy link
Contributor

sre-bot commented Sep 1, 2020

No release note, Please follow https://github.com/pingcap/community/blob/master/contributors/release-note-checker.md

@sre-bot
Copy link
Contributor

sre-bot commented Sep 1, 2020

download pd at http://fileserver.pingcap.net/download/builds/pingcap/pd/pr/f3e7254bb3c7b7a0c35855f022fcb98ca33e0fa6/centos7/pd-server.tar.gz

@sre-bot
Copy link
Contributor

sre-bot commented Sep 1, 2020

No release note, Please follow https://github.com/pingcap/community/blob/master/contributors/release-note-checker.md

@sre-bot
Copy link
Contributor

sre-bot commented Sep 1, 2020

download pd at http://fileserver.pingcap.net/download/builds/pingcap/pd/pr/f3e7254bb3c7b7a0c35855f022fcb98ca33e0fa6/centos7/pd-server.tar.gz

@sre-bot
Copy link
Contributor

sre-bot commented Sep 1, 2020

No release note, Please follow https://github.com/pingcap/community/blob/master/contributors/release-note-checker.md

@sre-bot
Copy link
Contributor

sre-bot commented Sep 1, 2020

download pd at http://fileserver.pingcap.net/download/builds/pingcap/pd/pr/f3e7254bb3c7b7a0c35855f022fcb98ca33e0fa6/centos7/pd-server.tar.gz

@sre-bot
Copy link
Contributor

sre-bot commented Sep 1, 2020

No release note, Please follow https://github.com/pingcap/community/blob/master/contributors/release-note-checker.md

@nolouch
Copy link
Contributor

nolouch commented Sep 4, 2020 •
edited

please address the comments. @ZenoTan

@ZenoTan
Address comment
4b28dc8 
Signed-off-by: ZenoTan <zenotan1998@gmail.com>
rleungx
rleungx reviewed Sep 4, 2020
View reviewed changes
server/heartbeat_streams.go Outdated
@@ -96,7 +96,7 @@ func (s *heartbeatStreams) run() {
if stream, ok := s.streams[storeID]; ok {
if err := stream.Send(msg); err != nil {
log.Error("send heartbeat message fail",
zap.Uint64("region-id", msg.RegionId), errs.ZapError(err))
zap.Uint64("region-id", msg.RegionId), errs.ZapError(errs.ErrPbStreamSend.Wrap(err).GenWithStackByArgs()))
Copy link
Member

Choose a reason for hiding this comment

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

I think gRPC send is enough for this?

@ZenoTan
Fix
ee73a18 
Signed-off-by: ZenoTan <zenotan1998@gmail.com>
rleungx
rleungx reviewed Sep 4, 2020
View reviewed changes
server/core/region_storage.go Outdated
@@ -15,6 +15,7 @@ package core

import (
"context"
"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.

need to change

@ZenoTan
Update
26780cb 
Signed-off-by: ZenoTan <zenotan1998@gmail.com>
@ZenoTan
Refactor error def
f37d2e3 
Signed-off-by: ZenoTan <zenotan1998@gmail.com>
nolouch
nolouch approved these changes Sep 4, 2020
View reviewed changes
Copy link
Contributor

@nolouch nolouch 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 the status/LGT1 Indicates that a PR has LGTM 1. label Sep 4, 2020
@nolouch
Copy link
Contributor

nolouch commented Sep 4, 2020

plz resolve the conflict.

ZenoTan and others added 2 commits September 4, 2020 14:51
@ZenoTan
Fix
5f0450c 
Signed-off-by: ZenoTan <zenotan1998@gmail.com>
@ZenoTan
Merge branch 'master' into server
e9f4836
rleungx
rleungx reviewed Sep 4, 2020
View reviewed changes
pkg/errs/errno.go Outdated Show resolved Hide resolved
rleungx
rleungx approved these changes Sep 4, 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.

The rest LGTM

@ti-srebot ti-srebot removed the status/LGT1 Indicates that a PR has LGTM 1. label Sep 4, 2020
@ti-srebot ti-srebot added the status/LGT2 Indicates that a PR has LGTM 2. label Sep 4, 2020
ZenoTan and others added 2 commits September 4, 2020 15:54
@ZenoTan @rleungx
Update pkg/errs/errno.go
9ac381a 
Co-authored-by: Ryan Leung <rleungx@gmail.com>
Signed-off-by: ZenoTan <zenotan1998@gmail.com>
@ZenoTan
Fix
f4cc283 
Signed-off-by: ZenoTan <zenotan1998@gmail.com>
@rleungx
Copy link
Member

rleungx commented Sep 4, 2020

/merge

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

/run-all-tests

@ti-srebot ti-srebot merged commit 12a08b1 into tikv:master Sep 4, 2020
@ZenoTan
Copy link
Contributor Author

ZenoTan commented Sep 7, 2020

/label needs-cherry-pick-4.0

@ti-srebot ti-srebot added the needs-cherry-pick-release-4.0 The PR needs to cherry pick to release-4.0 branch. label Sep 7, 2020
ti-srebot pushed a commit to ti-srebot/pd that referenced this pull request Sep 7, 2020
@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
Copy link
Contributor

cherry pick to release-4.0 in PR #2911

ti-srebot added a commit that referenced this pull request Sep 7, 2020
@ti-srebot
server: Refine log error format (#2873) (#2911)
a1d3230 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
Signed-off-by: ZenoTan <zenotan1998@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lhy1024 lhy1024 lhy1024 left review comments

@nolouch nolouch nolouch approved these changes

@rleungx rleungx rleungx approved these changes

@ti-srebot ti-srebot ti-srebot approved these changes

Assignees
No one assigned
Labels
contribution Indicates that the PR was contributed by an external member. needs-cherry-pick-release-4.0 The PR needs to cherry pick to release-4.0 branch. 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
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@ZenoTan @sre-bot @rleungx @nolouch @ti-srebot @lhy1024