Skip to content

lightning: make pre-check output message clearer (#30439)#30888

Merged
ti-chi-bot merged 12 commits intopingcap:release-5.3from
ti-srebot:release-5.3-eb6c89d6d404
Feb 18, 2022
Merged

lightning: make pre-check output message clearer (#30439)#30888
ti-chi-bot merged 12 commits intopingcap:release-5.3from
ti-srebot:release-5.3-eb6c89d6d404

Conversation

@ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Dec 20, 2021 •
edited
Loading

cherry-pick #30439 to release-5.3
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/30888

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tidb.git pr/30888:release-5.3-eb6c89d6d404

What problem does this PR solve?

Issue Number: close #30395

Problem Summary:

What is changed and how it works?

  • make tidb-lightning storage size check output message clearer
  • Only write the critical message into error message

The check result is adjusted as follow:

local disk space may not enough to finish import, estimate sorted data size is 249.5GiB, but local available is 58.35GiB, please set `tikv-importer.disk-quota` to a smaller value than 58.35GiB or change `mydumper.sorted-kv-dir` to another disk with enough space to finish imports

Return error change:

tidb lightning encountered error:  tidb-lightning pre-check failed: local disk space may not enough to finish import, estimate sorted data size is 249.5GiB, but local available is 58.35GiB, please set `tikv-importer.disk-quota` to a smaller value than 58.35GiB or change `mydumper.sorted-kv-dir` to another disk with enough space to finish imports

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

make tidb-lightning pre-check output message clearer

@glorv @ti-srebot
cherry pick pingcap#30439 to release-5.3
cdbab20 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 20, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • kennytm
  • lichunzhu

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.

Details

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/cherry-pick-not-approved do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Dec 20, 2021
@ti-srebot
Copy link
Contributor Author

ti-srebot commented Dec 20, 2021

/run-all-tests

@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Dec 20, 2021
@ti-srebot ti-srebot mentioned this pull request Dec 20, 2021
Merged
12 tasks
@ti-srebot ti-srebot added component/lightning This issue is related to Lightning of TiDB. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/5.3-cherry-pick labels Dec 20, 2021
@ti-chi-bot ti-chi-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 20, 2021
@ti-srebot
Copy link
Contributor Author

ti-srebot commented Dec 20, 2021

@glorv you're already a collaborator in bot's repo.

@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Dec 21, 2021
@glorv glorv mentioned this pull request Dec 22, 2021
Merged
12 tasks
@glorv glorv removed their assignment Dec 22, 2021
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 22, 2021
sleepymole
sleepymole reviewed Dec 27, 2021
View reviewed changes
br/pkg/lightning/restore/check_info_test.go

import (
"context"
. "github.com/pingcap/check"
Copy link
Contributor

@sleepymole sleepymole Dec 27, 2021

Choose a reason for hiding this comment

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

need fix imports

@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Feb 16, 2022
lichunzhu
lichunzhu approved these changes Feb 18, 2022
View reviewed changes
Copy link
Contributor

@lichunzhu lichunzhu 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 removed the status/LGT1 Indicates that a PR has LGTM 1. label Feb 18, 2022
@ti-chi-bot ti-chi-bot added the status/LGT2 Indicates that a PR has LGTM 2. label Feb 18, 2022
@lichunzhu
Copy link
Contributor

lichunzhu commented Feb 18, 2022

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Feb 18, 2022

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

DetailsCommit hash: 61fb532

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Feb 18, 2022
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Feb 18, 2022

@ti-srebot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@lichunzhu
Copy link
Contributor

lichunzhu commented Feb 18, 2022

/run-check_dev

@ti-chi-bot ti-chi-bot merged commit 37671db into pingcap:release-5.3 Feb 18, 2022
@lichunzhu lichunzhu deleted the release-5.3-eb6c89d6d404 branch February 18, 2022 11:14
@purelind purelind added this to the v5.3.1 milestone Feb 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kennytm kennytm kennytm approved these changes

@3pointer 3pointer Awaiting requested review from 3pointer

+2 more reviewers

@sleepymole sleepymole sleepymole left review comments

@lichunzhu lichunzhu lichunzhu approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

cherry-pick-approved Cherry pick PR approved by release team. component/lightning This issue is related to Lightning of TiDB. 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. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/5.3-cherry-pick

Projects

None yet

Milestone

v5.3.1

Development

Successfully merging this pull request may close these issues.

8 participants

@ti-srebot @ti-chi-bot @lichunzhu @kennytm @sleepymole @glorv @purelind @zhouqiang-cl