Merge #30623

30623: sql: unskip TestSplitAt r=nvanbenschoten a=tschottdorf The failure was fixed in #29324. Closes #29169. Release note: None Co-authored-by: Tobias Schottdorf <[email protected]>
cockroachdb · Sep 25, 2018 · 15e4c8d · 15e4c8d
2 parents f06556d + 85d5ab6
commit 15e4c8d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/pkg/sql/split_test.go b/pkg/sql/split_test.go
@@ -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())

diff --git a/pkg/storage/intent_resolver.go b/pkg/storage/intent_resolver.go
@@ -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()