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

lightning: fix check disk quota routine block when some engine is importing #44877

Merged
merged 1 commit into from
Jun 21, 2023
Merged

lightning: fix check disk quota routine block when some engine is importing #44877

merged 1 commit into from
Jun 21, 2023

Conversation

D3Hunter
Copy link
Contributor

What problem does this PR solve?

Issue Number: close #44867

Problem Summary:

What is changed and how it works?

  • make pebble db a atomic reference to avoid lock when check disk quota

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.

fix check disk quota routine block when some engine is importing

@ti-chi-bot ti-chi-bot bot added needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 21, 2023
@D3Hunter
Copy link
Contributor Author

/run-integration-br-test

@D3Hunter
Copy link
Contributor Author

/hold

@ti-chi-bot ti-chi-bot bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 21, 2023
@D3Hunter
Copy link
Contributor Author

hold until lightning integration test finished

GMHDBJD
GMHDBJD approved these changes Jun 21, 2023
View reviewed changes
Copy link
Contributor

@GMHDBJD GMHDBJD 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-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Jun 21, 2023
lance6716
lance6716 approved these changes Jun 21, 2023
View reviewed changes
br/pkg/lightning/backend/local/engine.go
// Close closes the engine and release all resources.
func (e *Engine) Close() error {
e.logger.Debug("closing local engine", zap.Stringer("engine", e.UUID), zap.Stack("stack"))
if e.db == nil {
db := e.getDB()
Copy link
Contributor

Choose a reason for hiding this comment

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

maybe db := e.db.Swap(nil)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

caller(CleanupEngine) locked it, so here doesn't matter

@ti-chi-bot ti-chi-bot bot added the lgtm label Jun 21, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Jun 21, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: GMHDBJD, lance6716

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

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot removed the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Jun 21, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Jun 21, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-06-21 09:03:42.764862385 +0000 UTC m=+179988.166112832: ☑️ agreed by GMHDBJD.
  • 2023-06-21 09:35:34.365198342 +0000 UTC m=+181899.766448790: ☑️ agreed by lance6716.

@D3Hunter
Copy link
Contributor Author

ci pass https://ci.pingcap.net/blue/organizations/jenkins/tidb_ghpr_integration_br_test/detail/tidb_ghpr_integration_br_test/12633/pipeline

@D3Hunter
Copy link
Contributor Author

/unhold

@ti-chi-bot ti-chi-bot bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 21, 2023
@ti-chi-bot ti-chi-bot bot merged commit 244d9c3 into master Jun 21, 2023
@ti-chi-bot ti-chi-bot bot deleted the fix-diskquota-block branch June 21, 2023 09:38
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.2: #44879.

This was referenced Jun 21, 2023
Merged
Merged
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.1: #44880.

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Jun 21, 2023
@D3Hunter @ti-chi-bot
This is an automated cherry-pick of pingcap#44877
33bcf6c 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.5: #44881.

@ti-chi-bot ti-chi-bot mentioned this pull request Jun 21, 2023
Merged
12 tasks
ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Jun 21, 2023
@D3Hunter @ti-chi-bot
This is an automated cherry-pick of pingcap#44877
8e13e58 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Jun 21, 2023
Merged
12 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.1: #44882.

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Jun 21, 2023
@D3Hunter @ti-chi-bot
This is an automated cherry-pick of pingcap#44877
63d7d8b 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot bot pushed a commit that referenced this pull request Jun 21, 2023
@ti-chi-bot
lightning: fix check disk quota routine block when some engine is imp…
3d13b72 
…orting (#44877) (#44879)

close #44867
ti-chi-bot bot pushed a commit that referenced this pull request Jun 29, 2023
@ti-chi-bot
lightning: fix check disk quota routine block when some engine is imp…
d52ff9d 
…orting (#44877) (#44881)

close #44867
ti-chi-bot bot pushed a commit that referenced this pull request Jun 29, 2023
@ti-chi-bot
lightning: fix check disk quota routine block when some engine is imp…
d68abe5 
…orting (#44877) (#44882)

close #44867
ti-chi-bot bot pushed a commit that referenced this pull request Jun 30, 2023
@ti-chi-bot
lightning: fix check disk quota routine block when some engine is imp…
ae39052 
…orting (#44877) (#44880)

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

@lance6716 lance6716 lance6716 approved these changes

@GMHDBJD GMHDBJD GMHDBJD approved these changes

Assignees
No one assigned
Labels
approved lgtm needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.2 release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

lightning disk quota block on check engine size while some engine is importing
4 participants
@D3Hunter @ti-chi-bot @lance6716 @GMHDBJD