Use Go's cross-platform process killing instead of the UNIX-only sysc…

…all.Kill
solo-io · Jun 25, 2018 · c5c126a · c5c126a
1 parent 1e0e09b
commit c5c126a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/pkg/providers/qemu/stop_instance_cgo.go b/pkg/providers/qemu/stop_instance_cgo.go
@@ -3,12 +3,13 @@
 package qemu
 
 import (
+	"os"
+	"strconv"
 	"syscall"
 
 	"github.com/Sirupsen/logrus"
 	"github.com/emc-advanced-dev/pkg/errors"
 	"github.com/solo-io/unik/pkg/types"
-	"strconv"
 )
 
 func (p *QemuProvider) StopInstance(id string) error {
@@ -23,9 +24,15 @@ func (p *QemuProvider) StopInstance(id string) error {
 		return errors.New("invalid instance id (should be qemu pid)", err)
 	}
 
-	if err := syscall.Kill(pid, syscall.SIGKILL); err != nil {
-		logrus.Warn("failed terminating instance, assuming instance has externally terminated", err)
+	process, err := os.FindProcess(pid)
+	if err != nil {
+		logrus.Warn("failed finding instance, assuming instance has externally terminated", err)
+	} else {
+		if err := process.Signal(syscall.SIGKILL); err != nil {
+			logrus.Warn("failed terminating instance, assuming instance has externally terminated", err)
+		}
 	}
+
 	volumesToDetach := []*types.Volume{}
 	volumes, err := p.ListVolumes()
 	if err != nil {

diff --git a/pkg/providers/ukvm/stop_instance_cgo.go b/pkg/providers/ukvm/stop_instance_cgo.go
@@ -3,12 +3,13 @@
 package ukvm
 
 import (
+	"os"
+	"strconv"
 	"syscall"
 
 	"github.com/Sirupsen/logrus"
 	"github.com/emc-advanced-dev/pkg/errors"
 	"github.com/solo-io/unik/pkg/types"
-	"strconv"
 )
 
 func (p *UkvmProvider) StopInstance(id string) error {
@@ -23,9 +24,15 @@ func (p *UkvmProvider) StopInstance(id string) error {
 		return errors.New("invalid instance id (should be ukvm pid)", err)
 	}
 
-	if err := syscall.Kill(pid, syscall.SIGKILL); err != nil {
-		logrus.Warn("failed terminating instance, assuming instance has externally terminated", err)
+	process, err := os.FindProcess(pid)
+	if err != nil {
+		logrus.Warn("failed finding instance, assuming instance has externally terminated", err)
+	} else {
+		if err := process.Signal(syscall.SIGKILL); err != nil {
+			logrus.Warn("failed terminating instance, assuming instance has externally terminated", err)
+		}
 	}
+
 	volumesToDetach := []*types.Volume{}
 	volumes, err := p.ListVolumes()
 	if err != nil {