Fix the signal reset on SIGs during Stop

pkg/run/run.go

@@ -67,12 +67,14 @@ func NewRunner(env *setup.Environment) *Runtime {
 		runTimestamp:   time.Now(),
 		ApplyChan:      make(chan struct{}),
 	}
-	signal.Notify(run.SigChan, syscall.SIGTERM, syscall.SIGINT)
 	run.api = api.NewAPI(run.SigChan, run.DeleteAPIManifests, run.state.IsReady, run.ApplyChan)
 	return run
 }
 
 func (r *Runtime) Run() error {
+	// the associated signal.Reset is defer in r.Stop method
+	signal.Notify(r.SigChan, syscall.SIGTERM, syscall.SIGINT)
+
 	defer close(r.ApplyChan)
 
 	glog.Infof("Timeout for this current run is %s", r.runTimeout.String())
@@ -100,7 +102,6 @@ func (r *Runtime) Run() error {
 	sigStopChan := make(chan os.Signal, 2)
 	defer close(sigStopChan)
 	signal.Notify(sigStopChan, syscall.SIGTSTP)
-	defer signal.Reset(syscall.SIGTERM, syscall.SIGINT)
 
 	kubeletProbeURL := fmt.Sprintf("http://127.0.0.1:%d/healthz", r.env.GetKubeletHealthzPort())
 	for {

pkg/run/stop.go

@@ -208,6 +208,9 @@ func (r *Runtime) runJournalTailers(failedUnits []string) error {
 }
 
 func (r *Runtime) Stop(withError error) error {
+	// reset run signals
+	signal.Reset(syscall.SIGTERM, syscall.SIGINT)
+
 	if r.env.IsSkippingStop() {
 		glog.Infof("Skipping stop")
 		return withError
@@ -226,7 +229,7 @@ func (r *Runtime) Stop(withError error) error {
 	failed, err := r.probeUnitStatuses()
 	if err != nil && len(failed) == 0 {
 		glog.Errorf("Probe units in failed: %v", err)
-		return err
+		errs = append(errs, err.Error())
 	}
 
 	if len(failed) != 0 {

pkg/util/systemd_action.go

@@ -106,6 +106,7 @@ func StartUnit(d *dbus.Conn, unitName string) error {
 		expectedSubState: []string{"running"},
 		getUnitStates:    MustGetUnitStates,
 	}
+	glog.V(2).Infof("Starting %s ...", unitName)
 	return sd.executeSystemdAction()
 }
 
@@ -119,6 +120,7 @@ func StopUnit(d *dbus.Conn, unitName string) error {
 		expectedSubState: []string{"dead", "failed"},
 		getUnitStates:    GetUnitStates,
 	}
+	glog.V(2).Infof("Stopping %s ...", unitName)
 	return sd.executeSystemdAction()
 }