Merge remote-tracking branch 'origin/master' into crashLoopBackOff

pkg/proc/basejob.go

@@ -17,6 +17,8 @@ import (
 )
 
 var (
+	_ Job = &CommonJob{}
+
 	ProcessWillBeRestartedError = errors.New("process will be restarted")
 	ProcessWillBeStoppedError   = errors.New("process will be stopped")
 )
@@ -67,6 +69,10 @@ func (job *baseJob) IsControllable() bool {
 	return job.Config.Controllable
 }
 
+func (job *baseJob) GetPhase() *JobPhase {
+	return &job.phase
+}
+
 func (job *baseJob) GetName() string {
 	return job.Config.Name
 }

pkg/proc/job_common.go

@@ -92,8 +92,6 @@ func (job *CommonJob) Run(ctx context.Context, _ chan<- error) error {
 			l.Info("stop process")
 			job.phase.Set(JobPhaseReasonStopped)
 			return nil
-		default:
-			l.WithError(err).Error("job exited with error")
 		}
 
 		attempts++

pkg/proc/runner.go

@@ -168,6 +168,11 @@ func (r *Runner) addJobIfNotExists(job Job) {
 }
 
 func (r *Runner) startJob(job Job) {
+	phase := job.GetPhase()
+	if phase.Is(JobPhaseReasonStopped) || phase.Is(JobPhaseReasonFailed) {
+		return
+	}
+
 	job.Init()
 
 	r.waitGroup.Add(1)

pkg/proc/types.go

@@ -56,6 +56,7 @@ type baseJob struct {
 	stdout    *os.File
 	stderr    *os.File
 	lastError error
+	phase     JobPhase
 }
 
 type BootJob struct {
@@ -70,7 +71,6 @@ type CommonJob struct {
 	Config *config.JobConfig
 
 	watchingFiles map[string]time.Time
-	phase         JobPhase
 }
 
 type CommonJobStatus struct {
@@ -98,6 +98,7 @@ type Job interface {
 	Run(context.Context, chan<- error) error
 	Watch()
 
+	GetPhase() *JobPhase
 	GetName() string
 }
 
@@ -110,6 +111,7 @@ func newBaseJob(c *config.BaseJobConfig) (*baseJob, error) {
 		stdout:  os.Stdout,
 		stderr:  os.Stderr,
 	}
+	job.phase.Set(JobPhaseReasonAwaitingReadiness)
 	if len(c.Stdout) == 0 {
 		return job, nil
 	}
@@ -144,13 +146,9 @@ func NewCommonJob(c *config.JobConfig) (*CommonJob, error) {
 		return nil, err
 	}
 
-	phase := JobPhase{}
-	phase.Set(JobPhaseReasonAwaitingReadiness)
-
 	j := CommonJob{
 		baseJob: *job,
 		Config:  c,
-		phase:   phase,
 	}
 
 	return &j, nil

pkg/proc/types_status.go

@@ -21,10 +21,20 @@ type JobPhase struct {
 }
 
 func (p *JobPhase) Set(reason JobPhaseReason) {
+	if p == nil {
+		p = &JobPhase{}
+	}
 	if p.Reason == reason {
 		return
 	}
 
 	p.LastChange = time.Now()
 	p.Reason = reason
 }
+
+func (p *JobPhase) Is(reason JobPhaseReason) bool {
+	if p == nil {
+		return false
+	}
+	return p.Reason == reason
+}