Skip to content

Commit

Permalink
Merge #99419
Browse files Browse the repository at this point in the history
99419: Revert "roachprod: change scp flags to avoid copy via local host" r=smg260 a=renatolabs

This reverts commit 9aa8536.

Epic: None

Release note: None

Co-authored-by: Renato Costa <renato@cockroachlabs.com>
  • Loading branch information
craig[bot] and renatolabs committed Mar 23, 2023
2 parents 1e99fa6 + 1ab74fa commit fe24358
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions pkg/roachprod/install/cluster_synced.go
Original file line number Diff line number Diff line change
Expand Up @@ -2382,9 +2382,7 @@ func (c *SyncedCluster) SSH(ctx context.Context, l *logger.Logger, sshArgs, args
// which we do want to be able to retry.
func scp(src, dest string) (*RunResultDetails, error) {
args := []string{
"scp",
// ssh to src then scp dsc mode, use agent forwarding, recursive, compression
"-R", "-A", "-r", "-C",
"scp", "-r", "-C",
"-o", "StrictHostKeyChecking=no",
}
args = append(args, sshAuthArgs()...)
Expand Down

0 comments on commit fe24358

Please sign in to comment.