Merge pull request #3129 from Komey/master

bobbypage · web-flow · commit ce07bb28eadc · 2022-11-08T18:39:08.000-08:00
fix mesos client panic while ExecutorPID is nill
diff --git a/cmd/internal/container/mesos/client.go b/cmd/internal/container/mesos/client.go
@@ -108,7 +108,7 @@ func (c *client) containerPID(id string) (int, error) {
 				return err
 			}
 
-			if c.cntr.ContainerStatus != nil {
+			if c.cntr.ContainerStatus != nil && c.cntr.ContainerStatus.ExecutorPID != nil {
 				pid = int(*c.cntr.ContainerStatus.ExecutorPID)
 			} else {
 				err = fmt.Errorf("error fetching Pid")

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ func (c *client) containerPID(id string) (int, error) {`
`108`	`108`	`return err`
`109`	`109`	`}`
`110`	`110`
`111`		`- if c.cntr.ContainerStatus != nil {`
	`111`	`+ if c.cntr.ContainerStatus != nil && c.cntr.ContainerStatus.ExecutorPID != nil {`
`112`	`112`	`pid = int(*c.cntr.ContainerStatus.ExecutorPID)`
`113`	`113`	`} else {`
`114`	`114`	`err = fmt.Errorf("error fetching Pid")`