UCP: util/memory: fix misleading log information when spilling to disk #15467
Conversation
This file contains 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
ghost
requested review from
SunRunAway
changed the title
SunRunAway
reviewed
Mar 18, 2020
util/memory/tracker.go
Outdated
| t.mu.children[i].toString(indent+" ", buffer) | ||
| t.mu.children[i].bytesLimit = tmp |
There was a problem hiding this comment.
Hi,
I think it's not necessary to change this method, we can just print the Consumed and Limit memory of the Tracker itself.
There was a problem hiding this comment.
Actually I think so too, the code I changed is too ugly
There was a problem hiding this comment.
TestSetDDLErrorCountLimit success on my own machine...
SunRunAway
reviewed
Mar 18, 2020
util/chunk/row_container.go
Outdated
| } | ||
| fmt.Fprintf(buffer, "%s \"consumed\": %s\n", "", t.BytesToString(t.BytesConsumed())) | ||
| buffer.WriteString("}\n") | ||
| logutil.BgLogger().Info("memory exceeds quota, spill to disk now.", zap.String("memory", buffer.String())) |
There was a problem hiding this comment.
Suggested change
| logutil.BgLogger().Info("memory exceeds quota, spill to disk now.", zap.String("memory", buffer.String())) | |
| logutil.BgLogger().Info("memory exceeds quota, spill to disk now.", zap.Int64("qonsumed", t.BytesConsumed()), zap.Int64("quota", t.GetBytesLimit())) |
We can just print the plain text instead of constructing JSON.
There was a problem hiding this comment.
sorry about that.
@yzwqf Please fix this typo.
XuHuaiyu
changed the title
SunRunAway
added
the
status/can-merge
|
/run-all-tests |
yzwqf
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What problem does this PR solve?
close #15401
What is changed and how it works?
Hide the unrelated quotas as the issue says.
Check List
Tests