Merge #159047

craig[bot] · tbg · craig[bot] · commit a747b7593c93 · 2025-12-11T13:00:05.000Z
159047: roachprod: allow multi-store local cluster r=tbg a=tbg Small drive-by to make the reproduction in #159045 work. Epic: none Co-authored-by: Tobias Grieger <tobias.b.grieger@gmail.com>
diff --git a/pkg/roachprod/install/cockroach.go b/pkg/roachprod/install/cockroach.go
@@ -688,7 +688,7 @@ func (c *SyncedCluster) Start(ctx context.Context, l *logger.Logger, startOpts S
 func (c *SyncedCluster) NodeDir(node Node, storeIndex int) string {
 	if c.IsLocal() {
 		if storeIndex != 1 {
-			panic("NodeDir only supports one store for local deployments")
+			return filepath.Join(c.localVMDir(node), "data", fmt.Sprintf("data%d", storeIndex))
 		}
 		return filepath.Join(c.localVMDir(node), "data")
 	}

Original file line number	Diff line number	Diff line change
`@@ -688,7 +688,7 @@ func (c SyncedCluster) Start(ctx context.Context, l logger.Logger, startOpts S`
`688`	`688`	`func (c *SyncedCluster) NodeDir(node Node, storeIndex int) string {`
`689`	`689`	`if c.IsLocal() {`
`690`	`690`	`if storeIndex != 1 {`
`691`		`- panic("NodeDir only supports one store for local deployments")`
	`691`	`+ return filepath.Join(c.localVMDir(node), "data", fmt.Sprintf("data%d", storeIndex))`
`692`	`692`	`}`
`693`	`693`	`return filepath.Join(c.localVMDir(node), "data")`
`694`	`694`	`}`