log: fix call depth for go1.12 panics#36144
Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom Mar 26, 2019
Merged
Conversation
Member
|
This change is |
ajwerner
commented
Mar 26, 2019
pkg/util/log/crash_reporting.go
Outdated
| // - panic.go // not present in go1.12 | ||
| // - panic() | ||
| // so ReportPanic should pop four frames. | ||
| if ver := runtime.Version(); strings.HasPrefix(ver, "go1.12") { |
Contributor
Author
There was a problem hiding this comment.
I could see doing something fancier here like parsing into an integer. Feedback appreciated.
petermattis
approved these changes
Mar 26, 2019
Collaborator
petermattis
left a comment
There was a problem hiding this comment.
Reviewable status:
complete! 0 of 0 LGTMs obtained (waiting on @ajwerner)
pkg/util/log/crash_reporting.go, line 96 at r1 (raw file):
Previously, ajwerner wrote…
I could see doing something fancier here like parsing into an integer. Feedback appreciated.
This is ugly. I don't have any better ideas, though. I suppose you could do this statically with build tags.
62a4745 to
420b4b3
Compare
This PR fixes the following test failure on Linux:
```
$ make test IGNORE_GOVERS=1 PKG=./pkg/util/log
--- FAIL: TestCrashReportingPacket (0.20s)
--- FAIL: TestCrashReportingPacket/#00 (0.00s)
crash_reporting_packet_test.go:155: expected crash_reporting_packet_test.go:85: boom, got testing.go:865: boom
--- FAIL: TestCrashReportingPacket/#1 (0.00s)
crash_reporting_packet_test.go:155: expected crash_reporting_packet_test.go:93: baam, got testing.go:865: baam
FAIL
```
Interestingly this is not quite the same failure noted in cockroachdb#35792, maybe that's
MacOS specific?
Release note: None
420b4b3 to
84bd549
Compare
Contributor
Author
The build tags worked better than I had expected given Updated accordningly. |
petermattis
approved these changes
Mar 26, 2019
Collaborator
petermattis
left a comment
There was a problem hiding this comment.
Reviewable status:
Contributor
Author
|
bors r+ |
craig bot
pushed a commit
that referenced
this pull request
Mar 26, 2019
36144: log: fix call depth for go1.12 panics r=ajwerner a=ajwerner
This PR fixes the following test failure on Linux:
```
$ make test IGNORE_GOVERS=1 PKG=./pkg/util/log
--- FAIL: TestCrashReportingPacket (0.20s)
--- FAIL: TestCrashReportingPacket/#00 (0.00s)
crash_reporting_packet_test.go:155: expected crash_reporting_packet_test.go:85: boom, got testing.go:865: boom
--- FAIL: TestCrashReportingPacket/#1 (0.00s)
crash_reporting_packet_test.go:155: expected crash_reporting_packet_test.go:93: baam, got testing.go:865: baam
FAIL
```
Interestingly this is not quite the same failure noted in #35792, maybe that's
MacOS specific?
Release note: None
Co-authored-by: Andrew Werner <ajwerner@cockroachlabs.com>
Contributor
Build succeeded |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR fixes the following test failure on Linux:
Interestingly this is not quite the same failure noted in #35792, maybe that's
MacOS specific?
Release note: None