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.

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

domain: fix data race in the Domain.bindHandle #38223

Merged
merged 5 commits into from
Sep 29, 2022

Conversation

hawkingrei
Copy link
Member

@hawkingrei hawkingrei commented Sep 28, 2022

Signed-off-by: Weizhen Wang wangweizhen@pingcap.com

What problem does this PR solve?

Issue Number: close #38062

Problem Summary:

What is changed and how it works?

Check List

Tests

  • Unit test
    enable race for unit test

Release note

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

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Sep 28, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Defined2014
  • xhebox

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. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Sep 28, 2022
@@ -124,6 +124,25 @@ func NewBindHandle(ctx sessionctx.Context) *BindHandle {
return handle
}

// Reset is to reset the BindHandle and clean old info.
func (h *BindHandle) Reset(ctx sessionctx.Context) {
Copy link
Contributor

Choose a reason for hiding this comment

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

It likes similar with NewBindHandle, maybe could combine those two functions.

Copy link
Member Author

Choose a reason for hiding this comment

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

OK, I remove the same code in the NewBindHandle. It is replaced with BindHandle.Reset.

@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Sep 28, 2022
Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>
Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>
Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 28, 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 Sep 29, 2022
@xhebox
Copy link
Contributor

xhebox commented Sep 29, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 0d2d37a

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 29, 2022
@hawkingrei hawkingrei added needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. labels Sep 29, 2022
@ti-chi-bot ti-chi-bot merged commit 99247f4 into pingcap:master Sep 29, 2022
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: cannot checkout 6.1: error checking out 6.1: exit status 1. output: error: pathspec '6.1' did not match any file(s) known to git

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: cannot checkout 6.3: error checking out 6.3: exit status 1. output: error: pathspec '6.3' did not match any file(s) known to git

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: cannot checkout 5.4: error checking out 5.4: exit status 1. output: error: pathspec '5.4' did not match any file(s) known to git

@hawkingrei hawkingrei deleted the data_race_in_the_domain branch September 29, 2022 03:28
@sre-bot
Copy link
Contributor

sre-bot commented Sep 29, 2022

TiDB MergeCI notify

🔴 Bad News! [1] CI still failing after this pr merged.
These failed integration tests don't seem to be introduced by the current PR.

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci-tidb/common-test 🔴 failed 1, success 10, total 11 15 min Existing failure
idc-jenkins-ci/integration-cdc-test 🟢 all 37 tests passed 32 min Existing passed
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 23 min Existing passed
idc-jenkins-ci-tidb/integration-common-test 🟢 all 17 tests passed 15 min Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 9 min 45 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 4 min 49 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 4 min 12 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 2 min 59 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 2 min 55 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

@wuhuizuo
Copy link
Contributor

/run-check-dev2

morgo added a commit to morgo/tidb that referenced this pull request Oct 4, 2022
…mprovements

* upstream/master: (56 commits)
  expression: make a copy when retrieving json path expression from cache (pingcap#38285)
  executor: make unit test TestIssue21732 stable (pingcap#38278)
  variables: enable variable hook to access storage (pingcap#38227)
  docs: update roadmap description (pingcap#38253)
  systable: Adapt with TiFlash system table update (pingcap#38191)
  planner, util/ranger: restrict mem usage for index join inner ranges (pingcap#38129)
  planner: separate cost model ver1/ver2 into different files (part 2) (pingcap#38273)
  metrics: Add IOPs, Disk Throughput to the overview dashboard (pingcap#38270)
  planner: refine index join range display for clustered index (pingcap#38259)
  *: delete `mInFlashbackCluster` related codes (pingcap#38241)
  session: turn the transaction to pessimistic mode when retrying (pingcap#38130)
  executor: enable race for executor/aggfuncs (pingcap#38262)
  planner: reopen CTE in apply only when correlate (pingcap#38214)
  planner: enable revive (pingcap#36649)
  *: add foreign key constraint check when execute update statement (pingcap#38156)
  *: DATA RACE in the temptable.AttachLocalTemporaryTableInfoSchema (pingcap#38237)
  executor,sessionctx: enable coprocessor paging and make TestCoprocessorPagingSize stable (pingcap#38161)
  domain: fix data race in the Domain.bindHandle (pingcap#38223)
  test: add information if test failed (pingcap#38234)
  preprocessor, planner: inline processing by default for single-consumer cte (pingcap#37800)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. 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/M Denotes a PR that changes 30-99 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
Development

Successfully merging this pull request may close these issues.

DATA RACE in the Domain.bindHandle
6 participants