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: check counter value to make code more robust #37380

Merged
merged 4 commits into from
Aug 26, 2022
Merged

lightning: check counter value to make code more robust #37380

merged 4 commits into from
Aug 26, 2022

Conversation

D3Hunter
Copy link
Contributor

What problem does this PR solve?

Issue Number: ref #37338

Problem Summary:

What is changed and how it works?

cannot reproduce this case in local env, so add this check to make code more robust, instead of panic

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

@D3Hunter D3Hunter added the component/lightning This issue is related to Lightning of TiDB. label Aug 25, 2022
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 25, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • buchuitoudegou
  • hi-rustin

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 release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. do-not-merge/needs-triage-completed labels Aug 25, 2022
@ti-chi-bot ti-chi-bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Aug 25, 2022
@D3Hunter D3Hunter marked this pull request as ready for review August 25, 2022 06:48
@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 Aug 25, 2022
@D3Hunter
Copy link
Contributor Author

/cc @buchuitoudegou @gozssky

@D3Hunter
Copy link
Contributor Author

/run-integration-br-test

@D3Hunter D3Hunter added the needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. label Aug 25, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Aug 25, 2022 •
edited by ti-chi-bot
Loading

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/33f5903a88fd7501697ed315d67e8805715eeade

buchuitoudegou
buchuitoudegou approved these changes Aug 25, 2022
View reviewed changes
br/pkg/lightning/restore/restore.go Outdated Show resolved Hide resolved
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 25, 2022
@D3Hunter @buchuitoudegou
Update br/pkg/lightning/restore/restore.go
f6de4e5 
Co-authored-by: Obliviate <756541536@qq.com>
@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 Aug 25, 2022
@D3Hunter
Copy link
Contributor Author

/run-integration-br-test

@D3Hunter
Copy link
Contributor Author

ci success https://ci.pingcap.net/blue/organizations/jenkins/br_ghpr_unit_and_integration_test/detail/br_ghpr_unit_and_integration_test/13031/pipeline

@D3Hunter
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: f6de4e5

@ti-chi-bot ti-chi-bot added status/can-merge Indicates a PR has been approved by a committer. needs-cherry-pick-6.2 and removed do-not-merge/needs-triage-completed labels Aug 26, 2022
@D3Hunter
Copy link
Contributor Author

/merge

@ti-chi-bot ti-chi-bot merged commit b99aebe into pingcap:master Aug 26, 2022
@ti-srebot ti-srebot mentioned this pull request Aug 26, 2022
Merged
12 tasks
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Aug 26, 2022
@D3Hunter @ti-srebot
cherry pick pingcap#37380 to release-6.1
7b7cdfe 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-6.1 in PR #37398

@ti-srebot ti-srebot mentioned this pull request Aug 26, 2022
Closed
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-6.2 in PR #37399

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Aug 26, 2022
@D3Hunter @ti-srebot
cherry pick pingcap#37380 to release-6.2
81ee039 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@sre-bot
Copy link
Contributor

sre-bot commented Aug 26, 2022

TiDB MergeCI notify

🔴 Bad News! New failing [1] 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/integration-common-test 🟥 failed 2, success 15, total 17 15 min New failing
idc-jenkins-ci-tidb/common-test 🔴 failed 2, success 9, total 11 15 min Existing failure
idc-jenkins-ci/integration-cdc-test 🟢 all 36 tests passed 34 min Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 11 min Existing passed
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 6 min 7 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 4 min 48 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 4 min 29 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 3 min 27 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 3 min 10 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

@D3Hunter D3Hunter deleted the more-robust branch August 26, 2022 05:23
morgo added a commit to morgo/tidb that referenced this pull request Aug 27, 2022
@morgo
Merge remote-tracking branch 'upstream/master' into improve-sysvar-co…
028958e 
…verage

* upstream/master: (109 commits)
  *: rename TemporaryTableAttachedInfoSchema (pingcap#37408)
  *: enable noloopclosure (pingcap#37153)
  executor: add JSON opaque value condition to everywhere (pingcap#37390)
  *: refine mock session manager (pingcap#37400)
  lightning: check counter value to make code more robust (pingcap#37380)
  *: use go 1.19 (pingcap#36223)
  br: restore tiflash replica count after PiTR (pingcap#37181)
  testkit,executor: add MustQueryWitnContext API and fix unstable test TestCoprocessorPriority (pingcap#37382)
  executor: add conversion to opaque value for json_objectagg and json_arrayagg (pingcap#37337)
  expression: quote json path if necessarily (pingcap#37375)
  *: support ACCOUNT (UN)LOCK when creating/altering user (pingcap#37052)
  log-backup: support the ddl(exchange partition) when PiTR  (pingcap#37050)
  *: change `integration.BeforeTest` to `integration.BeforeTestExternal` to avoid skip tests (pingcap#37341)
  executor: fix unstable TestGlobalMemoryTrackerOnCleanUp (pingcap#37372)
  util/ranger: avoid building ranges twice in detachCNFCondAndBuildRangeForIndex (pingcap#37177)
  statistics: track used stats status during query (pingcap#37101)
  *: fix data race in `TestTiFlashGroupIndexWhenStartup` (pingcap#37371)
  lightning: fix dpanic log when init session vars (pingcap#37301)
  executor: let plan replayer record table tiflash replica (pingcap#37336)
  types: fix a bug in casting str2str when `union` (pingcap#37242)
  ...
ti-chi-bot pushed a commit that referenced this pull request Sep 8, 2022
@ti-srebot
lightning: check counter value to make code more robust (#37380) (#37398
ec2e605 
)

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

@Rustin170506 Rustin170506 Rustin170506 approved these changes

@buchuitoudegou buchuitoudegou buchuitoudegou approved these changes

@sleepymole sleepymole Awaiting requested review from sleepymole

Assignees
No one assigned
Labels
component/lightning This issue is related to Lightning of TiDB. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@D3Hunter @ti-chi-bot @sre-bot @ti-srebot @buchuitoudegou @Rustin170506