Merge pull request #3258 from umohnani8/1.15-sig

openshift-merge-robot · web-flow · commit 37347ad6bd10 · 2020-02-12T11:57:31.000+01:00
[1.15] Pass down the integer value of the stop signal
diff --git a/oci/container.go b/oci/container.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"sync"
 	"syscall"
@@ -21,7 +22,7 @@ import (
 )
 
 const (
-	defaultStopSignal    = "TERM"
+	defaultStopSignal    = "15"
 	defaultStopSignalInt = 15
 )
 
@@ -131,11 +132,13 @@ func (c *Container) GetStopSignal() string {
 		return defaultStopSignal
 	}
 	cleanSignal := strings.TrimPrefix(strings.ToUpper(c.stopSignal), "SIG")
-	_, ok := signal.SignalMap[cleanSignal]
+	val, ok := signal.SignalMap[cleanSignal]
 	if !ok {
 		return defaultStopSignal
 	}
-	return cleanSignal
+	// return the stop signal in the form of its int converted to a string
+	// i.e stop signal 34 is returned as "34" to avoid back and forth conversion
+	return strconv.Itoa(int(val))
 }
 
 // StopSignal returns the container's own stop signal configured from
diff --git a/oci/container_test.go b/oci/container_test.go
@@ -45,7 +45,7 @@ var _ = t.Describe("Container", func() {
 		Expect(sut.StatePath()).To(Equal("dir/state.json"))
 		Expect(sut.Metadata()).To(Equal(&pb.ContainerMetadata{}))
 		Expect(sut.StateNoLock().Version).To(BeEmpty())
-		Expect(sut.GetStopSignal()).To(Equal("TERM"))
+		Expect(sut.GetStopSignal()).To(Equal("15"))
 		Expect(sut.CreatedAt().UnixNano()).
 			To(BeNumerically("<", time.Now().UnixNano()))
 	})
@@ -150,7 +150,7 @@ var _ = t.Describe("Container", func() {
 		signal := container.GetStopSignal()
 
 		// Then
-		Expect(signal).To(Equal("TERM"))
+		Expect(signal).To(Equal("15"))
 	})
 
 	It("should succeed get NetNsPath if not provided", func() {
@@ -201,7 +201,7 @@ var _ = t.Describe("Container", func() {
 		signal := container.GetStopSignal()
 
 		// Then
-		Expect(signal).To(Equal("TRAP"))
+		Expect(signal).To(Equal("5"))
 	})
 
 	It("should succeed to get the state from disk", func() {
diff --git a/oci/kill.go b/oci/kill.go
@@ -4,16 +4,15 @@ import (
 	"syscall"
 
 	"github.com/docker/docker/pkg/signal"
-	"github.com/pkg/errors"
 )
 
-// Reverse lookup signal string from its map
-func findStringInSignalMap(killSignal syscall.Signal) (string, error) {
-	for k, v := range signal.SignalMap {
+// Check if killSignal exists in the signal map
+func inSignalMap(killSignal syscall.Signal) bool {
+	for _, v := range signal.SignalMap {
 		if v == killSignal {
-			return k, nil
+			return true
 		}
 	}
-	return "", errors.Errorf("unable to convert signal to string")
+	return false
 
 }
diff --git a/oci/runtime_oci.go b/oci/runtime_oci.go
@@ -752,13 +752,11 @@ func (r *runtimeOCI) SignalContainer(c *Container, sig syscall.Signal) error {
 	c.opLock.Lock()
 	defer c.opLock.Unlock()
 
-	signalString, err := findStringInSignalMap(sig)
-	if err != nil {
-		return err
+	if !inSignalMap(sig) {
+		return errors.Errorf("unable to find %s in the signal map", sig.String())
 	}
 
-	return utils.ExecCmdWithStdStreams(os.Stdin, os.Stdout, os.Stderr, r.path,
-		rootFlag, r.root, "kill", c.ID(), signalString)
+	return utils.ExecCmdWithStdStreams(os.Stdin, os.Stdout, os.Stderr, r.path, "kill", c.ID(), strconv.Itoa(int(sig)))
 }
 
 // AttachContainer attaches IO to a running container.

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import (`
`5`	`5`	`"fmt"`
`6`	`6`	`"os"`
`7`	`7`	`"path/filepath"`
	`8`	`+ "strconv"`
`8`	`9`	`"strings"`
`9`	`10`	`"sync"`
`10`	`11`	`"syscall"`
`@@ -21,7 +22,7 @@ import (`
`21`	`22`	`)`
`22`	`23`
`23`	`24`	`const (`
`24`		`- defaultStopSignal = "TERM"`
	`25`	`+ defaultStopSignal = "15"`
`25`	`26`	`defaultStopSignalInt = 15`
`26`	`27`	`)`
`27`	`28`
`@@ -131,11 +132,13 @@ func (c *Container) GetStopSignal() string {`
`131`	`132`	`return defaultStopSignal`
`132`	`133`	`}`
`133`	`134`	`cleanSignal := strings.TrimPrefix(strings.ToUpper(c.stopSignal), "SIG")`
`134`		`- _, ok := signal.SignalMap[cleanSignal]`
	`135`	`+ val, ok := signal.SignalMap[cleanSignal]`
`135`	`136`	`if !ok {`
`136`	`137`	`return defaultStopSignal`
`137`	`138`	`}`
`138`		`- return cleanSignal`
	`139`	`+ // return the stop signal in the form of its int converted to a string`
	`140`	`+ // i.e stop signal 34 is returned as "34" to avoid back and forth conversion`
	`141`	`+ return strconv.Itoa(int(val))`
`139`	`142`	`}`
`140`	`143`
`141`	`144`	`// StopSignal returns the container's own stop signal configured from`
Original file line number	Diff line number	Diff line change
`@@ -4,16 +4,15 @@ import (`
`4`	`4`	`"syscall"`
`5`	`5`
`6`	`6`	`"github.com/docker/docker/pkg/signal"`
`7`		`- "github.com/pkg/errors"`
`8`	`7`	`)`
`9`	`8`
`10`		`-// Reverse lookup signal string from its map`
`11`		`-func findStringInSignalMap(killSignal syscall.Signal) (string, error) {`
`12`		`- for k, v := range signal.SignalMap {`
	`9`	`+// Check if killSignal exists in the signal map`
	`10`	`+func inSignalMap(killSignal syscall.Signal) bool {`
	`11`	`+ for _, v := range signal.SignalMap {`
`13`	`12`	`if v == killSignal {`
`14`		`- return k, nil`
	`13`	`+ return true`
`15`	`14`	`}`
`16`	`15`	`}`
`17`		`- return "", errors.Errorf("unable to convert signal to string")`
	`16`	`+ return false`
`18`	`17`
`19`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -752,13 +752,11 @@ func (r runtimeOCI) SignalContainer(c Container, sig syscall.Signal) error {`
`752`	`752`	`c.opLock.Lock()`
`753`	`753`	`defer c.opLock.Unlock()`
`754`	`754`
`755`		`- signalString, err := findStringInSignalMap(sig)`
`756`		`- if err != nil {`
`757`		`- return err`
	`755`	`+ if !inSignalMap(sig) {`
	`756`	`+ return errors.Errorf("unable to find %s in the signal map", sig.String())`
`758`	`757`	`}`
`759`	`758`
`760`		`- return utils.ExecCmdWithStdStreams(os.Stdin, os.Stdout, os.Stderr, r.path,`
`761`		`- rootFlag, r.root, "kill", c.ID(), signalString)`
	`759`	`+ return utils.ExecCmdWithStdStreams(os.Stdin, os.Stdout, os.Stderr, r.path, "kill", c.ID(), strconv.Itoa(int(sig)))`
`762`	`760`	`}`
`763`	`761`
`764`	`762`	`// AttachContainer attaches IO to a running container.`