Merge pull request #3578 from sofat1989/containerd-stress

estesp · web-flow · commit 3ad49a208b5a · 2019-08-26T05:57:40.000-07:00
update the max if cur will be greater than max for setting the limit
diff --git a/cmd/containerd-stress/rlimit_unix.go b/cmd/containerd-stress/rlimit_unix.go
@@ -31,6 +31,9 @@ func setRlimit() error {
 		}
 		if limit.Cur < rlimit {
 			limit.Cur = rlimit
+			if limit.Max < limit.Cur {
+				limit.Max = limit.Cur
+			}
 			if err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, &limit); err != nil {
 				return err
 			}

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,9 @@ func setRlimit() error {`
`31`	`31`	`}`
`32`	`32`	`if limit.Cur < rlimit {`
`33`	`33`	`limit.Cur = rlimit`
	`34`	`+ if limit.Max < limit.Cur {`
	`35`	`+ limit.Max = limit.Cur`
	`36`	`+ }`
`34`	`37`	`if err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, &limit); err != nil {`
`35`	`38`	`return err`
`36`	`39`	`}`