Skip to content

Commit

Permalink
Merge #112714
Browse files Browse the repository at this point in the history
112714: roachprod: remove `WaitDelay` call in `localSession` r=herkolategan a=renatolabs

This call was added during work on #111064 as an attempt to fix issues during development. It should not be needed for correctness. It also makes backporting that work to 23.1 not possible, since the `WaitDelay` API was introduced in Go 1.20.

Epic: none

Release note: None

Co-authored-by: Renato Costa <[email protected]>
  • Loading branch information
craig[bot] and renatolabs committed Oct 20, 2023
2 parents 9ae8d5c + 247abb5 commit 7efc09d
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions pkg/roachprod/install/session.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"os/exec"
"path/filepath"
"sync"
"time"

"github.com/cockroachdb/cockroach/pkg/roachprod/config"
rperrors "github.com/cockroachdb/cockroach/pkg/roachprod/errors"
Expand Down Expand Up @@ -246,7 +245,6 @@ type localSession struct {
func newLocalSession(cmd string) *localSession {
ctx, cancel := context.WithCancel(context.Background())
fullCmd := exec.CommandContext(ctx, "/bin/bash", "-c", cmd)
fullCmd.WaitDelay = time.Second
return &localSession{fullCmd, cancel}
}

Expand Down

0 comments on commit 7efc09d

Please sign in to comment.