Merge pull request #66 from divolgin/9281

[ch9281] Leave Daemon running, render "done" in the UI

Author: divolgin

pkg/lifecycle/render/config/daemon.go

@@ -34,9 +34,11 @@ type Daemon struct {
 	UI     cli.Ui
 
 	sync.Mutex
-	currentStep     *api.Step
-	currentStepName string
-	pastSteps       []api.Step
+	currentStep          *api.Step
+	currentStepName      string
+	currentStepConfirmed bool
+	allStepsDone         bool
+	pastSteps            []api.Step
 
 	startOnce sync.Once
 
@@ -59,9 +61,16 @@ func (d *Daemon) PushStep(ctx context.Context, stepName string, step api.Step) {
 	}
 	d.currentStepName = stepName
 	d.currentStep = &step
+	d.currentStepConfirmed = false
 	d.NotifyStepChanged(stepName)
 }
 
+func (d *Daemon) AllStepsDone(ctx context.Context) {
+	d.Lock()
+	defer d.Unlock()
+	d.allStepsDone = true
+}
+
 // "this is fine"
 func (d *Daemon) EnsureStarted(ctx context.Context, release *api.Release) chan error {
 	errChan := make(chan error)
@@ -161,11 +170,24 @@ func (d *Daemon) getLoadingStep(c *gin.Context) {
 	})
 }
 
+func (d *Daemon) getDoneStep(c *gin.Context) {
+	c.JSON(200, map[string]interface{}{
+		"currentStep": map[string]interface{}{
+			"done": map[string]interface{}{},
+		},
+		"phase": "done",
+	})
+}
+
 func (d *Daemon) getCurrentStep(c *gin.Context) {
 	if d.currentStep == nil {
 		d.getLoadingStep(c)
 		return
 	}
+	if d.allStepsDone {
+		d.getDoneStep(c)
+		return
+	}
 
 	c.JSON(200, map[string]interface{}{
 		"currentStep": d.currentStep,
@@ -197,9 +219,23 @@ func (d *Daemon) postConfirmMessage(c *gin.Context) {
 		return
 	}
 
-	go func() {
-		d.MessageConfirmed <- request.StepName
-	}()
+	if d.allStepsDone {
+		c.JSON(400, map[string]interface{}{
+			"error": "no more steps",
+		})
+		return
+	}
+
+	debug.Log("event", "confirm.step", "step", d.currentStepName)
+
+	// Confirmation for each step will only be read once from the channel
+	if d.currentStepConfirmed {
+		c.String(200, "")
+		return
+	}
+
+	d.currentStepConfirmed = true
+	d.MessageConfirmed <- request.StepName
 
 	c.String(200, "")
 }

pkg/lifecycle/runner.go

@@ -74,6 +74,7 @@ func ExecutorFromViper(v *viper.Viper) *StepExecutor {
 	}
 }
 func (e *StepExecutor) WithDaemon(d *config.Daemon) *StepExecutor {
+	e.Daemon = d
 	e.Renderer = e.Renderer.WithDaemon(d)
 	e.Messenger = e.Messenger.WithDaemon(d)
 	return e
@@ -91,5 +92,5 @@ func (r *Runner) Run(ctx context.Context, release *api.Release) error {
 		}
 	}
 
-	return nil
+	return r.Executor.End(ctx)
 }

pkg/lifecycle/step.go

@@ -9,12 +9,14 @@ import (
 	"github.com/replicatedcom/ship/pkg/api"
 	"github.com/replicatedcom/ship/pkg/lifecycle/message"
 	"github.com/replicatedcom/ship/pkg/lifecycle/render"
+	"github.com/replicatedcom/ship/pkg/lifecycle/render/config"
 )
 
 type StepExecutor struct {
 	Logger    log.Logger
 	Renderer  *render.Renderer
 	Messenger message.Messenger
+	Daemon    *config.Daemon
 }
 
 func (s *StepExecutor) Execute(ctx context.Context, release *api.Release, step *api.Step) error {
@@ -34,3 +36,8 @@ func (s *StepExecutor) Execute(ctx context.Context, release *api.Release, step *
 
 	return nil
 }
+
+func (s *StepExecutor) End(ctx context.Context) error {
+	s.Daemon.AllStepsDone(ctx)
+	return nil
+}

pkg/ship/ship.go

@@ -139,26 +139,20 @@ func (s *Ship) Execute(ctx context.Context) error {
 		return errors.Wrap(err, "resolve specs")
 	}
 
-	errChan := make(chan error)
 	go func() {
-		err = s.Runner.Run(ctx, release)
-		errChan <- errors.Wrap(err, "run lifecycle")
-
+		err := s.Runner.Run(ctx, release)
+		if err != nil {
+			level.Error(s.Logger).Log("event", "shutdown", "reason", "error", "err", err)
+		} else {
+			level.Info(s.Logger).Log("event", "shutdown", "reason", "complete with no errors")
+		}
 	}()
 
 	signalChan := make(chan os.Signal, 1)
 	signal.Notify(signalChan, syscall.SIGINT, syscall.SIGTERM)
-	select {
-	case sig := <-signalChan:
-		level.Info(s.Logger).Log("event", "shutdown", "reason", "signal", "signal", sig)
-		return nil
-	case err := <-errChan:
-		if err != nil {
-			level.Error(s.Logger).Log("event", "shutdown", "reason", "error", "err", err)
-		}
-		level.Info(s.Logger).Log("event", "shutdown", "reason", "complete with no errors")
-		return err
-	}
+	sig := <-signalChan
+	level.Info(s.Logger).Log("event", "shutdown", "reason", "signal", "signal", sig)
+	return nil
 
 	// todo send shipRegisterInstall mutation to pg.