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

sql: unskip TestSplitAt #30623

Merged
merged 2 commits into from
Sep 25, 2018
Merged

sql: unskip TestSplitAt #30623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3a93f2
sql: unskip TestSplitAt
tbg Sep 25, 2018
85d5ab6
storage: fix data race in contentionQueue
tbg Sep 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions pkg/sql/split_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ import (
func TestSplitAt(t *testing.T) {
defer leaktest.AfterTest(t)()

t.Skip("TODO(benesch): #29169: will be fixed by #29324")

params, _ := tests.CreateTestServerParams()
s, db, _ := serverutils.StartServer(t, params)
defer s.Stopper().Stop(context.TODO())
Expand Down
7 changes: 7 additions & 0 deletions pkg/storage/intent_resolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,13 @@ func (cq *contentionQueue) add(
// contended key (i.e. newWIErr != nil).
contended.setLastTxnMeta(nil)
}
if newIntentTxn != nil {
// Shallow copy the TxnMeta. After this request returns (i.e. now), we might
// mutate it (DistSender and such), but the receiver of the channel will read
// it.
newIntentTxnCopy := *newIntentTxn
newIntentTxn = &newIntentTxnCopy
}
curPusher.waitCh <- newIntentTxn
close(curPusher.waitCh)
cq.mu.Unlock()
Expand Down