Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

roachprod,roachtest: backport recent improvements #105831

Merged
merged 6 commits into from
Jul 4, 2023
Merged

roachprod,roachtest: backport recent improvements #105831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4f4d10b
roachprod: make c.Parallel fail fast when a command on any of the nod…
Apr 1, 2023
9d4495f
roachprod: modify signature of c.Parallel to return ParallelResult,err
Apr 2, 2023
be5ea43
roachprod: `c.ParallelE` can be made optionally made to fail slow
Apr 11, 2023
d45e151
roachprod: add WithWaitOnFail() when executing sql across nodes
Jun 5, 2023
c758211
roachprod: fix confusing start-up error
herkolategan Jun 13, 2023
3a12d96
roachprod: fix `fileExistsOnFirstNode` check
Jun 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions pkg/cmd/roachprod/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,8 @@ var runCmd = &cobra.Command{
`,
Args: cobra.MinimumNArgs(1),
Run: wrap(func(_ *cobra.Command, args []string) error {
return roachprod.Run(context.Background(), config.Logger, args[0], extraSSHOptions, tag, secure, os.Stdout, os.Stderr, args[1:])
return roachprod.Run(context.Background(), config.Logger, args[0], extraSSHOptions, tag,
secure, os.Stdout, os.Stderr, args[1:], install.WithWaitOnFail())
}),
}

Expand Down Expand Up @@ -802,7 +803,7 @@ multiple nodes the destination file name will be prefixed with the node number.
if len(args) == 3 {
dest = args[2]
}
return roachprod.Get(config.Logger, args[0], src, dest)
return roachprod.Get(context.Background(), config.Logger, args[0], src, dest)
}),
}

Expand Down Expand Up @@ -858,7 +859,7 @@ Examples:
if cmd.CalledAs() == "pprof-heap" {
pprofOpts.Heap = true
}
return roachprod.Pprof(config.Logger, args[0], pprofOpts)
return roachprod.Pprof(context.Background(), config.Logger, args[0], pprofOpts)
}),
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/roachtest/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1969,7 +1969,7 @@ func (c *clusterImpl) Get(
}
c.status(fmt.Sprintf("getting %v", src))
defer c.status("")
return errors.Wrap(roachprod.Get(l, c.MakeNodes(opts...), src, dest), "cluster.Get")
return errors.Wrap(roachprod.Get(ctx, l, c.MakeNodes(opts...), src, dest), "cluster.Get")
}

// Put a string into the specified file on the remote(s).
Expand Down
Loading