kv: set txn MinTimestamp in SetFixedTimestamp

This was causing tests to stall because a transaction's MinTimestamp could end up being above its commit timestamp. Release note: None
cockroachdb · Nov 15, 2019 · a2fa1d1 · a2fa1d1
1 parent 7df3b6f
commit a2fa1d1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/pkg/internal/client/sender.go b/pkg/internal/client/sender.go
@@ -337,6 +337,7 @@ func (m *MockTransactionalSender) CommitTimestampFixed() bool {
 func (m *MockTransactionalSender) SetFixedTimestamp(_ context.Context, ts hlc.Timestamp) {
 	m.txn.Timestamp = ts
 	m.txn.OrigTimestamp = ts
+	m.txn.MinTimestamp = ts
 	m.txn.MaxTimestamp = ts
 	m.txn.OrigTimestampWasObserved = true
 }

diff --git a/pkg/kv/txn_coord_sender.go b/pkg/kv/txn_coord_sender.go
@@ -1195,6 +1195,7 @@ func (tc *TxnCoordSender) SetFixedTimestamp(ctx context.Context, ts hlc.Timestam
 	tc.mu.Lock()
 	tc.mu.txn.Timestamp = ts
 	tc.mu.txn.OrigTimestamp = ts
+	tc.mu.txn.MinTimestamp = ts
 	tc.mu.txn.MaxTimestamp = ts
 	tc.mu.txn.OrigTimestampWasObserved = true
 	tc.mu.Unlock()