Merge pull request #1289 from AkihiroSuda/dev

AkihiroSuda · web-flow · commit 2899222cb071 · 2022-08-02T01:59:28.000+09:00
Fix `can't get final child's PID from pipe` on rootless (v0.22.1 regression)
diff --git a/cmd/nerdctl/run_linux.go b/cmd/nerdctl/run_linux.go
@@ -196,10 +196,15 @@ func setPlatformOptions(opts []oci.SpecOpts, cmd *cobra.Command, id string) ([]o
 }
 
 func setOOMScoreAdj(opts []oci.SpecOpts, cmd *cobra.Command) ([]oci.SpecOpts, error) {
+	if !cmd.Flags().Changed("oom-score-adj") {
+		return opts, nil
+	}
+
 	score, err := cmd.Flags().GetInt("oom-score-adj")
 	if err != nil {
 		return nil, err
 	}
+	// score=0 means literally zero, not "unchanged"
 
 	if score < -1000 || score > 1000 {
 		return nil, fmt.Errorf("invalid value %d, range for oom score adj is [-1000, 1000]", score)

Original file line number	Diff line number	Diff line change
`@@ -196,10 +196,15 @@ func setPlatformOptions(opts []oci.SpecOpts, cmd *cobra.Command, id string) ([]o`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`func setOOMScoreAdj(opts []oci.SpecOpts, cmd *cobra.Command) ([]oci.SpecOpts, error) {`
	`199`	`+ if !cmd.Flags().Changed("oom-score-adj") {`
	`200`	`+ return opts, nil`
	`201`	`+ }`
	`202`	`+`
`199`	`203`	`score, err := cmd.Flags().GetInt("oom-score-adj")`
`200`	`204`	`if err != nil {`
`201`	`205`	`return nil, err`
`202`	`206`	`}`
	`207`	`+ // score=0 means literally zero, not "unchanged"`
`203`	`208`
`204`	`209`	`if score < -1000 \|\| score > 1000 {`
`205`	`210`	`return nil, fmt.Errorf("invalid value %d, range for oom score adj is [-1000, 1000]", score)`