*: fix panic during defrag operation #7579
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
heyitsanthony
suggested changes
Mar 22, 2017
mvcc/backend/backend.go
Outdated
| return tx | ||
| } | ||
|
|
||
| func (b *backend) unsafebegin(write bool) *bolt.Tx { |
mvcc/backend/batch_tx.go
Outdated
| t.unsafecommit(stop) | ||
| } | ||
|
|
||
| func (t *batchTxBuffered) unsafecommit(stop bool) { |
heyitsanthony
approved these changes
Mar 23, 2017
|
@gyuho fix the patches? the test patch has backend changes |
fanminshi
reviewed
Mar 23, 2017
| defer clus.Terminate(t) | ||
|
|
||
| cli := clus.RandClient() | ||
| kvc := toGRPC(cli).KV |
There was a problem hiding this comment.
is there a reason not to use cli directly for Put() and Defragment()?
There was a problem hiding this comment.
yes, the ./integration/ tests should use pure grpc interfaces when possible
Fix etcd-io#7526. When resetting `bolt.Tx` in `defrag` and `batchTxBuffered.commit` operation, we do not hold `readTx` lock, so the inflight range requests can trigger panic in `mvcc.Range` paths. This fixes by moving mutexes out and hold it while resetting the `readTx`. Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>
Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>
|
@xiang90 Yes. Will redeploy after merge. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When resetting
bolt.TxindefragandbatchTxBuffered.commitoperation, we do not holdreadTxlock, so the inflight range requests can trigger panic inmvcc.Rangepaths. This fixes by moving mutexes out and hold it while resetting thereadTx.The test case is added (fails in current master branch).