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

*: extend the semantic of mem-quota-query to mem-quota-session #38423

Merged
merged 34 commits into from
Nov 2, 2022
Merged

*: extend the semantic of mem-quota-query to mem-quota-session #38423

merged 34 commits into from
Nov 2, 2022

Conversation

XuHuaiyu
Copy link
Contributor

@XuHuaiyu XuHuaiyu commented Oct 12, 2022 •
edited
Loading

What problem does this PR solve?

Issue Number: close #38429

Problem Summary:

What is changed and how it works?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

@XuHuaiyu XuHuaiyu added the type/enhancement The issue or PR belongs to an enhancement. label Oct 12, 2022
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Oct 12, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • guo-shaoge
  • wshwsh12

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none Denotes a PR that doesn't merit a release note. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Oct 12, 2022
@ti-chi-bot ti-chi-bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Oct 12, 2022
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Oct 12, 2022
@XuHuaiyu
Copy link
Contributor Author

/rebuild

@XuHuaiyu XuHuaiyu marked this pull request as ready for review October 12, 2022 10:20
@XuHuaiyu XuHuaiyu requested a review from a team as a code owner October 12, 2022 10:20
@ti-chi-bot ti-chi-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 12, 2022
@wshwsh12 wshwsh12 self-requested a review October 12, 2022 12:54
@ti-chi-bot ti-chi-bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Oct 19, 2022
@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 25, 2022
@XuHuaiyu
Copy link
Contributor Author

/rebuild

2 similar comments
@XuHuaiyu
Copy link
Contributor Author

/rebuild

@XuHuaiyu
Copy link
Contributor Author

/rebuild

@XuHuaiyu
Copy link
Contributor Author

I do not know why this test failed.

    result.go:49: 
        	Error Trace:	/home/jenkins/.tidb/tmp/63a9840cd0739f2c243bb46478607469/sandbox/linux-sandbox/7057/execroot/__main__/bazel-out/k8-fastbuild/bin/ddl/concurrentddltest/concurrentddltest_test_/concurrentddltest_test.runfiles/__main__/ddl/concurrentddltest/result.go:49
        	            				/home/jenkins/.tidb/tmp/63a9840cd0739f2c243bb46478607469/sandbox/linux-sandbox/7057/execroot/__main__/bazel-out/k8-fastbuild/bin/ddl/concurrentddltest/concurrentddltest_test_/concurrentddltest_test.runfiles/__main__/ddl/concurrentddltest/switch_test.go:113
        	Error:      	Not equal: 
        	            	expected: "[0]\n"
        	            	actual  : "[11]\n"
        	            	
        	            	Diff:
        	            	--- Expected
        	            	+++ Actual
        	            	@@ -1,2 +1,2 @@
        	            	-[0]
        	            	+[11]
        	            	 
        	Test:       	TestConcurrentDDLSwitch
        	Messages:   	sql:select count(*) from mysql.tidb_ddl_job, args:[]

wshwsh12
wshwsh12 reviewed Oct 31, 2022
View reviewed changes
util/memory/action.go Outdated
if a.logHook == nil {
logutil.BgLogger().Warn("memory exceeds quota",
zap.Error(errMemExceedThreshold.GenWithStackByArgs(t.label, t.BytesConsumed(), t.GetBytesLimit(), t.String())))
return
Copy link
Contributor

Choose a reason for hiding this comment

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

We need panic when OOM

executor/executor.go Outdated
action := &memory.LogOnExceed{ConnID: ctx.GetSessionVars().ConnectionID}
action.SetLogHook(domain.GetDomain(ctx).ExpensiveQueryHandle().LogOnQueryExceedMemQuota)
sc.MemTracker.SetActionOnExceed(action)
if variable.EnableTmpStorageOnOOM.Load() && vars.DiskTracker != nil {
Copy link
Contributor

Choose a reason for hiding this comment

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

vars.DiskTracker is always not nil.. Should we check sc.DiskTracker != nil?

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 1, 2022
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Nov 1, 2022
@XuHuaiyu
Copy link
Contributor Author

XuHuaiyu commented Nov 2, 2022

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: a49a4eb

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 2, 2022
@ti-chi-bot ti-chi-bot merged commit ef95612 into pingcap:master Nov 2, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Nov 2, 2022

TiDB MergeCI notify

🔴 Bad News! New failing [2] after this pr merged.
These new failed integration tests seem to be caused by the current PR, please try to fix these new failed integration tests, thanks!

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci-tidb/sqllogic-test-1 🟥 failed 1, success 25, total 26 6 min 32 sec New failing
idc-jenkins-ci-tidb/sqllogic-test-2 🟥 1 min 22 sec New failing
idc-jenkins-ci-tidb/integration-common-test 🔴 failed 2, success 15, total 17 19 min Existing failure
idc-jenkins-ci-tidb/integration-ddl-test 🔴 failed 2, success 4, total 6 13 min Existing failure
idc-jenkins-ci-tidb/common-test ✅ all 11 tests passed 14 min Fixed
idc-jenkins-ci/integration-cdc-test 🟢 all 38 tests passed 22 min Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 15 min Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 4 min 32 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 3 min 32 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wshwsh12 wshwsh12 wshwsh12 approved these changes

@qw4990 qw4990 qw4990 approved these changes

@guo-shaoge guo-shaoge guo-shaoge approved these changes

Assignees
No one assigned
Labels
release-note-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/enhancement The issue or PR belongs to an enhancement.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

extend the semantics of tidb_mem_quota_query
6 participants
@XuHuaiyu @ti-chi-bot @sre-bot @guo-shaoge @qw4990 @wshwsh12