Merge cockroachdb#106509

106509: upgrades: fix transaction retry bug in auto config job migration r=knz a=stevendanna The SELECT query here, despite being inside the func passed to Txn wasn't actually using the transaction. If the Txn retries, then the following select appears to hang forever. This has not been observed in any real-world test but was observed when experimenting with randomly injecting retryable errors (cockroachdb#106506). Epic: none Release note: None Co-authored-by: Steven Danna <[email protected]>
DrewKimball · Jul 10, 2023 · 28fad87 · 28fad87
2 parents ee0b0d6 + 85e1845
commit 28fad87
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/upgrade/upgrades/create_auto_config_runner_job.go b/pkg/upgrade/upgrades/create_auto_config_runner_job.go
@@ -31,10 +31,10 @@ func createAutoConfigRunnerJob(
 	}
 
 	if err := d.DB.Txn(ctx, func(ctx context.Context, txn isql.Txn) error {
-		row, err := d.DB.Executor().QueryRowEx(
+		row, err := txn.QueryRowEx(
 			ctx,
 			"check for existing auto config runner job",
-			nil,
+			txn.KV(),
 			sessiondata.RootUserSessionDataOverride,
 			"SELECT 1 FROM system.jobs WHERE id = $1",
 			jobs.AutoConfigRunnerJobID,