Merge #68988

68988: roachtest: avoid NPE on cluster creation retries exceeded r=otan a=tbg When this branch was hit (as it was recently on AWS due to quota issues) roachtest was giving up anyway, but it wasn't nice that it exploded prematurely instead of shutting down in an orderly fashion. Release note: None Co-authored-by: Tobias Grieger <[email protected]>
cockroachdb · Aug 17, 2021 · ecab37d · ecab37d
2 parents d61e634 + 373120f
commit ecab37d
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/pkg/cmd/roachtest/cluster.go b/pkg/cmd/roachtest/cluster.go
@@ -861,7 +861,11 @@ func (f *clusterFactory) newCluster(
 		}
 
 		// Logs for creating a new cluster go to a dedicated log file.
-		logPath := filepath.Join(f.artifactsDir, runnerLogsDir, "cluster-create", c.name+".log")
+		var retryStr string
+		if i > 0 {
+			retryStr = "-retry" + strconv.Itoa(i)
+		}
+		logPath := filepath.Join(f.artifactsDir, runnerLogsDir, "cluster-create", c.name+retryStr+".log")
 		l, err := logger.RootLogger(logPath, teeOpt)
 		if err != nil {
 			log.Fatalf(ctx, "%v", err)
@@ -891,7 +895,7 @@ func (f *clusterFactory) newCluster(
 		c.Destroy(ctx, closeLogger, l)
 		if i > maxAttempts {
 			// Here we have to release the alloc, as we are giving up.
-			c.destroyState.alloc.Release()
+			cfg.alloc.Release()
 			return nil, err
 		}
 		// Try again to create the cluster.