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

*: fix lost index bug of insert on duplicate key update (#16672) #16690

Merged
merged 1 commit into from
Apr 22, 2020
Merged

*: fix lost index bug of insert on duplicate key update (#16672) #16690

merged 1 commit into from
Apr 22, 2020

Conversation

crazycs520
Copy link
Contributor

Fix issue #16669

When check the untouched index, we should also check the memory-buffer in the session too.

What problem does this PR solve?

cherry pick #16672

@crazycs520
*: fix lost index bug of insert on duplicate key update (pingcap#16672)
11ef753 
Fix issue pingcap#16669

When check the untouched index, we should also check the memory-buffer in the session too.
@crazycs520 crazycs520 added sig/transaction SIG:Transaction priority/release-blocker This issue blocks a release. Please solve it ASAP. type/3.0-cherry-pick type/bugfix This PR fixes a bug. labels Apr 22, 2020
@tiancaiamao
Copy link
Contributor

LGTM

@tiancaiamao tiancaiamao added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 22, 2020
@bb7133
Copy link
Member

bb7133 commented Apr 22, 2020

/run-unit-test

@github-actions github-actions bot added the sig/execution SIG execution label Apr 22, 2020
@bb7133
Copy link
Member

bb7133 commented Apr 22, 2020

Data Race in test:

[error="context deadline exceeded"]
[2020-04-22T04:10:46.152Z] ==================

[2020-04-22T04:10:46.152Z] WARNING: DATA RACE
[2020-04-22T04:10:46.152Z] Write at 0x00c0003d1698 by goroutine 139:
[2020-04-22T04:10:46.152Z]   go.etcd.io/etcd/mvcc.(*keyIndex).put()
[2020-04-22T04:10:46.152Z]       /home/jenkins/agent/workspace/tidb_ghpr_unit_test/go/pkg/mod/go.etcd.io/etcd@v0.0.0-20190320044326-77d4b742cdbf/mvcc/key_index.go:101 +0x1f6
[2020-04-22T04:10:46.152Z]   go.etcd.io/etcd/mvcc.(*treeIndex).Put()
[2020-04-22T04:10:46.152Z]       /home/jenkins/agent/workspace/tidb_ghpr_unit_test/go/pkg/mod/go.etcd.io/etcd@v0.0.0-20190320044326-77d4b742cdbf/mvcc/index.go:65 +0x1db

[2020-04-22T04:10:46.152Z] Previous read at 0x00c0003d1698 by goroutine 53:
[2020-04-22T04:10:46.152Z]   go.etcd.io/etcd/mvcc.(*keyIndex).get()
[2020-04-22T04:10:46.152Z]       /home/jenkins/agent/workspace/tidb_ghpr_unit_test/go/pkg/mod/go.etcd.io/etcd@v0.0.0-20190320044326-77d4b742cdbf/mvcc/key_index.go:365 +0x684
[2020-04-22T04:10:46.152Z]   go.etcd.io/etcd/mvcc.(*treeIndex).Revisions.func1()
[2020-04-22T04:10:46.152Z]       /home/jenkins/agent/workspace/tidb_ghpr_unit_test/go/pkg/mod/go.etcd.io/etcd@v0.0.0-20190320044326-77d4b742cdbf/mvcc/index.go:116 +0xab
[2020-04-22T04:10:46.152Z]   go.etcd.io/etcd/mvcc.(*treeIndex).visit.func1()
[2020-04-22T04:10:46.152Z]       /home/jenkins/agent/workspace/tidb_ghpr_unit_test/go/pkg/mod/go.etcd.io/etcd@v0.0.0-20190320044326-77d4b742cdbf/mvcc/index.go:102 +0x8b

https://internal.pingcap.net/idc-jenkins/blue/organizations/jenkins/tidb_ghpr_unit_test/detail/tidb_ghpr_unit_test/33575/pipeline

@bb7133
Copy link
Member

bb7133 commented Apr 22, 2020

/run-unit-test

bb7133
bb7133 reviewed Apr 22, 2020
View reviewed changes
Copy link
Member

@bb7133 bb7133 left a comment

Choose a reason for hiding this comment

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

LGTM

@bb7133 bb7133 added status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Apr 22, 2020
@sre-bot
Copy link
Contributor

sre-bot commented Apr 22, 2020

/run-all-tests

@sre-bot
Copy link
Contributor

sre-bot commented Apr 22, 2020

@crazycs520 merge failed.

@bb7133
Copy link
Member

bb7133 commented Apr 22, 2020

Failed test case:

 Cannot contact test-go1130-memvolume-jc2h9: hudson.remoting.ChannelClosedException: Channel "unknown": Remote call on JNLP4-connect connection from 10.233.81.234/10.233.81.234:43872 failed. The channel is closing down or has closed down

[2020-04-22T04:38:46.005Z] Could not connect to test-go1130-memvolume-jc2h9 to send interrupt signal to process

https://internal.pingcap.net/idc-jenkins/blue/organizations/jenkins/tidb_ghpr_sqllogic_test_1/detail/tidb_ghpr_sqllogic_test_1/11527/pipeline/78

@bb7133
Copy link
Member

bb7133 commented Apr 22, 2020

/run-sqllogic-test-1

@coocood
Copy link
Member

coocood commented Apr 22, 2020

/run-sqllogic-test-2

@coocood coocood merged commit 75a0f11 into pingcap:release-3.0 Apr 22, 2020
bb7133 pushed a commit that referenced this pull request Apr 22, 2020
@crazycs520 @bb7133
*: fix lost index bug of insert on duplicate key update (#16672) (#16690
e19f922 
)

Fix issue #16669

When check the untouched index, we should also check the memory-buffer in the session too.
@bb7133 bb7133 added this to the v3.0.13 milestone Apr 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bb7133 bb7133 bb7133 approved these changes

@tiancaiamao tiancaiamao Awaiting requested review from tiancaiamao

Assignees
No one assigned
Labels
priority/release-blocker This issue blocks a release. Please solve it ASAP. sig/execution SIG execution sig/transaction SIG:Transaction status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug. type/3.0-cherry-pick
Projects
None yet
Milestone
v3.0.13
Development

Successfully merging this pull request may close these issues.
5 participants
@crazycs520 @tiancaiamao @bb7133 @sre-bot @coocood