mirror of https://github.com/docker/cli.git
Merge pull request #24761 from WeiZhang555/parallel-stop
Enhancement: allow parallel stop, pause, unpause
This commit is contained in:
commit
62f513507e
|
@ -34,8 +34,9 @@ func runPause(dockerCli *command.DockerCli, opts *pauseOptions) error {
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
|
|
||||||
var errs []string
|
var errs []string
|
||||||
|
errChan := parallelOperation(ctx, opts.containers, dockerCli.Client().ContainerPause)
|
||||||
for _, container := range opts.containers {
|
for _, container := range opts.containers {
|
||||||
if err := dockerCli.Client().ContainerPause(ctx, container); err != nil {
|
if err := <-errChan; err != nil {
|
||||||
errs = append(errs, err.Error())
|
errs = append(errs, err.Error())
|
||||||
} else {
|
} else {
|
||||||
fmt.Fprintf(dockerCli.Out(), "%s\n", container)
|
fmt.Fprintf(dockerCli.Out(), "%s\n", container)
|
||||||
|
|
|
@ -39,11 +39,15 @@ func NewStopCommand(dockerCli *command.DockerCli) *cobra.Command {
|
||||||
|
|
||||||
func runStop(dockerCli *command.DockerCli, opts *stopOptions) error {
|
func runStop(dockerCli *command.DockerCli, opts *stopOptions) error {
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
|
timeout := time.Duration(opts.time) * time.Second
|
||||||
|
|
||||||
var errs []string
|
var errs []string
|
||||||
|
|
||||||
|
errChan := parallelOperation(ctx, opts.containers, func(ctx context.Context, id string) error {
|
||||||
|
return dockerCli.Client().ContainerStop(ctx, id, &timeout)
|
||||||
|
})
|
||||||
for _, container := range opts.containers {
|
for _, container := range opts.containers {
|
||||||
timeout := time.Duration(opts.time) * time.Second
|
if err := <-errChan; err != nil {
|
||||||
if err := dockerCli.Client().ContainerStop(ctx, container, &timeout); err != nil {
|
|
||||||
errs = append(errs, err.Error())
|
errs = append(errs, err.Error())
|
||||||
} else {
|
} else {
|
||||||
fmt.Fprintf(dockerCli.Out(), "%s\n", container)
|
fmt.Fprintf(dockerCli.Out(), "%s\n", container)
|
||||||
|
|
|
@ -35,8 +35,9 @@ func runUnpause(dockerCli *command.DockerCli, opts *unpauseOptions) error {
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
|
|
||||||
var errs []string
|
var errs []string
|
||||||
|
errChan := parallelOperation(ctx, opts.containers, dockerCli.Client().ContainerUnpause)
|
||||||
for _, container := range opts.containers {
|
for _, container := range opts.containers {
|
||||||
if err := dockerCli.Client().ContainerUnpause(ctx, container); err != nil {
|
if err := <-errChan; err != nil {
|
||||||
errs = append(errs, err.Error())
|
errs = append(errs, err.Error())
|
||||||
} else {
|
} else {
|
||||||
fmt.Fprintf(dockerCli.Out(), "%s\n", container)
|
fmt.Fprintf(dockerCli.Out(), "%s\n", container)
|
||||||
|
|
|
@ -90,3 +90,35 @@ func getExitCode(dockerCli *command.DockerCli, ctx context.Context, containerID
|
||||||
}
|
}
|
||||||
return c.State.Running, c.State.ExitCode, nil
|
return c.State.Running, c.State.ExitCode, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func parallelOperation(ctx context.Context, cids []string, op func(ctx context.Context, id string) error) chan error {
|
||||||
|
if len(cids) == 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
const defaultParallel int = 50
|
||||||
|
sem := make(chan struct{}, defaultParallel)
|
||||||
|
errChan := make(chan error)
|
||||||
|
|
||||||
|
// make sure result is printed in correct order
|
||||||
|
output := map[string]chan error{}
|
||||||
|
for _, c := range cids {
|
||||||
|
output[c] = make(chan error, 1)
|
||||||
|
}
|
||||||
|
go func() {
|
||||||
|
for _, c := range cids {
|
||||||
|
err := <-output[c]
|
||||||
|
errChan <- err
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
go func() {
|
||||||
|
for _, c := range cids {
|
||||||
|
sem <- struct{}{} // Wait for active queue sem to drain.
|
||||||
|
go func(container string) {
|
||||||
|
output[container] <- op(ctx, container)
|
||||||
|
<-sem
|
||||||
|
}(c)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
return errChan
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue