Merge pull request #937 from laverya/state-completion-race-condition

finish writing to stepsCompleted before allowing next step to read it

Author: laverya

pkg/lifecycle/daemon/routes_navcycle.go

@@ -58,6 +58,9 @@ type NavcycleRoutes struct {
 
 	// Prevent data races when registering preexecute functions
 	mut sync.Mutex
+
+	// Prevent a race when registering completed steps and starting the next step
+	completeMut sync.Mutex
 }
 
 // Register registers routes
@@ -141,6 +144,12 @@ func (d *NavcycleRoutes) maybeAbortDueToMissingRequirement(requires []string, c
 // although from a UI perspective the order is probably not strictly defined
 func (d *NavcycleRoutes) getRequiredButIncompleteStepFor(requires []string) (string, error) {
 	debug := level.Debug(log.With(d.Logger, "method", "getRequiredButIncompleteStepFor"))
+	if len(requires) == 0 {
+		return "", nil
+	}
+
+	d.completeMut.Lock()
+	defer d.completeMut.Unlock()
 
 	stepsCompleted := map[string]interface{}{}
 	currentState, err := d.StateManager.TryLoad()

pkg/lifecycle/daemon/routes_navcycle_completestep.go

@@ -48,8 +48,12 @@ func (d *NavcycleRoutes) completeStep(c *gin.Context) {
 		// hack, give it 10 ms in case its an instant step. Hydrate and send will read progress from the syncMap
 		time.Sleep(10 * time.Millisecond)
 
+		d.completeMut.Lock()
 		d.hydrateAndSend(step, c)
-		go d.handleAsync(errChan, debug, step, stepID)
+		go func() {
+			defer d.completeMut.Unlock()
+			d.handleAsync(errChan, debug, step, stepID)
+		}()
 		return
 	}
 	d.errNotFound(c)