Merge cockroachdb#62391

62391: cli: support addr 0 in multi-node demo r=knz a=ajwerner Before this change, if you specified that the ports should be chosen by the system with `--http-port 0 --sql-port 0` then it would not work for multi-node demo. This fixes that. Release note: None Co-authored-by: Andrew Werner <[email protected]>
lunevalex · Mar 23, 2021 · 4fb8e2d · 4fb8e2d
2 parents 3f9f18e + 2008b33
commit 4fb8e2d
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/pkg/cli/demo_cluster.go b/pkg/cli/demo_cluster.go
@@ -340,7 +340,13 @@ func testServerArgsForTransientCluster(
 		// Unit tests can be run with multiple processes side-by-side with
 		// `make stress`. This is bound to not work with fixed ports.
 		sqlPort := sqlBasePort + int(nodeID) - 1
+		if sqlBasePort == 0 {
+			sqlPort = 0
+		}
 		httpPort := httpBasePort + int(nodeID) - 1
+		if httpBasePort == 0 {
+			httpPort = 0
+		}
 		args.SQLAddr = fmt.Sprintf(":%d", sqlPort)
 		args.HTTPAddr = fmt.Sprintf(":%d", httpPort)
 	}