Merge pull request #201 from thepwagner/stopvmm-guard-stopped

stopVMM: don't signal if stopped

Author: xibz

machine.go

@@ -23,6 +23,7 @@ import (
 	"os/signal"
 	"path/filepath"
 	"strconv"
+	"strings"
 	"sync"
 	"syscall"
 	"time"
@@ -578,7 +579,11 @@ func (m *Machine) StopVMM() error {
 func (m *Machine) stopVMM() error {
 	if m.cmd != nil && m.cmd.Process != nil {
 		m.logger.Debug("stopVMM(): sending sigterm to firecracker")
-		return m.cmd.Process.Signal(syscall.SIGTERM)
+		err := m.cmd.Process.Signal(syscall.SIGTERM)
+		if err != nil && !strings.Contains(err.Error(), "os: process already finished") {
+			return err
+		}
+		return nil
 	}
 	m.logger.Debug("stopVMM(): no firecracker process running, not sending a signal")
 

machine_test.go

@@ -1139,6 +1139,7 @@ func TestWait(t *testing.T) {
 				m.StopVMM()
 				time.Sleep(1 * time.Second)
 				cancel()
+				time.Sleep(1 * time.Second)
 			},
 		},
 	}
@@ -1151,13 +1152,18 @@ func TestWait(t *testing.T) {
 			socketPath := filepath.Join(testDataPath, fsSafeTestName.Replace(t.Name()))
 			defer os.Remove(socketPath)
 
+			// Tee logs for validation:
+			var logBuffer bytes.Buffer
+			machineLogger := logrus.New()
+			machineLogger.Out = io.MultiWriter(os.Stderr, &logBuffer)
+
 			cfg := createValidConfig(t, socketPath)
 			m, err := NewMachine(ctx, cfg, func(m *Machine) {
 				// Rewriting m.cmd partially wouldn't work since Cmd has
 				// some unexported members
 				args := m.cmd.Args[1:]
 				m.cmd = exec.Command(getFirecrackerBinaryPath(), args...)
-			})
+			}, WithLogger(logrus.NewEntry(machineLogger)))
 			require.NoError(t, err)
 
 			err = m.Start(vmContext)
@@ -1186,6 +1192,10 @@ func TestWait(t *testing.T) {
 			require.Equal(t, "os: process already finished", err.Error())
 
 			wg.Wait()
+
+			machineLogs := logBuffer.String()
+			assert.NotContains(t, machineLogs, "level=error")
+			assert.NotContains(t, machineLogs, "process already finished")
 		})
 	}
 }