Skip to content

Commit 5abfc90

Browse files
committed
roachprod: only wait on boot disk
Previously, during the wait for VMs to start we would check both the boot disk and the data disk. But in order to support VMs that only have a boot disk we should not be checking the data disk here. This change updates `Wait` to only check the boot disk. Epic: None Release note: None
1 parent 20c3c8e commit 5abfc90

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

pkg/roachprod/install/cluster_synced.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1085,7 +1085,10 @@ func (c *SyncedCluster) Wait(ctx context.Context, l *logger.Logger) error {
10851085
func(ctx context.Context, node Node) (*RunResultDetails, error) {
10861086
res := &RunResultDetails{Node: node}
10871087
var err error
1088-
cmd := fmt.Sprintf("test -e %s -a -e %s", vm.DisksInitializedFile, vm.OSInitializedFile)
1088+
// Only the `vm.OSInitializedFile` file is checked and not the
1089+
// `vm.DisksInitializedFile`, because it's possible to create VMs without
1090+
// any attached disks other than the boot disk.
1091+
cmd := fmt.Sprintf("test -e %s", vm.OSInitializedFile)
10891092
// N.B. we disable ssh debug output capture, lest we end up with _thousands_ of useless .log files.
10901093
opts := cmdOptsWithDebugDisabled()
10911094
for j := 0; j < 600; j++ {

0 commit comments

Comments
 (0)