github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #7748 from yanggangtony/containerd-stress

Browse Source 
fix panic when containerd-stress density --count 0
This commit is contained in:
Maksym Pavlenko
2022-12-05 10:08:58 -08:00
committed by GitHub
parent 9f44e6c3c0 b0dd506553
commit 6918432780
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/containerd-stress/density.go
View File

@@ -20,6 +20,7 @@ import (
"bufio" "bufio"
"context" "context"
"encoding/json" "encoding/json"
"errors"
"fmt" "fmt"
"os" "os"
"os/signal" "os/signal"
@@ -47,6 +48,15 @@ var densityCommand = cli.Command{
}, },
}, },
Action: func(cliContext *cli.Context) error { Action: func(cliContext *cli.Context) error {
var (
pids []uint32
count = cliContext.Int("count")
)
if count < 1 {
return errors.New("count cannot be less than one")
}
config := config{ config := config{
Address: cliContext.GlobalString("address"), Address: cliContext.GlobalString("address"),
Duration: cliContext.GlobalDuration("duration"), Duration: cliContext.GlobalDuration("duration"),
@@ -76,10 +86,6 @@ var densityCommand = cli.Command{
s := make(chan os.Signal, 1) s := make(chan os.Signal, 1)
signal.Notify(s, syscall.SIGTERM, syscall.SIGINT) signal.Notify(s, syscall.SIGTERM, syscall.SIGINT)
var (
pids []uint32
count = cliContext.Int("count")
)
loop: loop:
for i := 0; i < count+1; i++ { for i := 0; i < count+1; i++ {
select { select {