feat: config hot-reload - fix merge conflicts

Author: sammcj

proxy/process.go

@@ -119,8 +119,10 @@ func isValidTransition(from, to ProcessState) bool {
 		return to == StateStopping
 	case StateStopping:
 		return to == StateStopped || to == StateShutdown
-	case StateFailed, StateShutdown:
-		return false // No transitions allowed from these states
+	case StateFailed:
+		return to == StateStopped // Allow resetting a failed process
+	case StateShutdown:
+		return false // No transitions from shutdown
 	}
 	return false
 }
@@ -412,7 +414,20 @@ func (p *Process) ProxyRequest(w http.ResponseWriter, r *http.Request) {
 
 	// prevent new requests from being made while stopping or irrecoverable
 	currentState := p.CurrentState()
-	if currentState == StateFailed || currentState == StateShutdown || currentState == StateStopping {
+
+	if currentState == StateFailed {
+		p.proxyLogger.Infof("<%s> Attempting to recover from failed state.", p.ID)
+		// Attempt to reset the state to stopped so it can be restarted
+		if _, err := p.swapState(StateFailed, StateStopped); err != nil {
+			p.proxyLogger.Errorf("<%s> Failed to reset state from Failed to Stopped: %v. Current state: %s", p.ID, err, p.CurrentState())
+			http.Error(w, fmt.Sprintf("Process failed and could not be reset, state is %s", p.CurrentState()), http.StatusServiceUnavailable)
+			return
+		}
+		p.proxyLogger.Infof("<%s> Process state reset to Stopped from Failed.", p.ID)
+		currentState = p.CurrentState() // Re-fetch current state, should now be StateStopped
+	}
+
+	if currentState == StateShutdown || currentState == StateStopping {
 		http.Error(w, fmt.Sprintf("Process can not ProxyRequest, state is %s", currentState), http.StatusServiceUnavailable)
 		return
 	}

proxy/process_test.go

@@ -109,13 +109,16 @@ func TestProcess_BrokenModelConfig(t *testing.T) {
 	req := httptest.NewRequest("GET", "/", nil)
 	w := httptest.NewRecorder()
 	process.ProxyRequest(w, req)
-	assert.Equal(t, http.StatusBadGateway, w.Code)
-	assert.Contains(t, w.Body.String(), "unable to start process")
+	assert.Equal(t, http.StatusBadGateway, w.Code) // First attempt fails to start
+	assert.Contains(t, w.Body.String(), "unable to start process: start() failed: exec: \"nonexistent-command\": executable file not found in $PATH")
+	assert.Equal(t, StateFailed, process.CurrentState()) // Should be in failed state after first attempt
 
+	// Second request should also attempt to start and fail similarly due to recovery logic
 	w = httptest.NewRecorder()
 	process.ProxyRequest(w, req)
-	assert.Equal(t, http.StatusServiceUnavailable, w.Code)
-	assert.Contains(t, w.Body.String(), "Process can not ProxyRequest, state is failed")
+	assert.Equal(t, http.StatusBadGateway, w.Code) // Second attempt also fails to start
+	assert.Contains(t, w.Body.String(), "unable to start process: start() failed: exec: \"nonexistent-command\": executable file not found in $PATH")
+	assert.Equal(t, StateFailed, process.CurrentState()) // Should end up in failed state again
 }
 
 func TestProcess_UnloadAfterTTL(t *testing.T) {
@@ -266,7 +269,7 @@ func TestProcess_SwapState(t *testing.T) {
 		{"Ready to Starting", StateReady, StateReady, StateStarting, ErrInvalidStateTransition, StateReady},
 		{"Ready to Failed", StateReady, StateReady, StateFailed, ErrInvalidStateTransition, StateReady},
 		{"Stopping to Ready", StateStopping, StateStopping, StateReady, ErrInvalidStateTransition, StateStopping},
-		{"Failed to Stopped", StateFailed, StateFailed, StateStopped, ErrInvalidStateTransition, StateFailed},
+		{"Failed to Stopped", StateFailed, StateFailed, StateStopped, nil, StateStopped},
 		{"Failed to Starting", StateFailed, StateFailed, StateStarting, ErrInvalidStateTransition, StateFailed},
 		{"Shutdown to Stopped", StateShutdown, StateShutdown, StateStopped, ErrInvalidStateTransition, StateShutdown},
 		{"Shutdown to Starting", StateShutdown, StateShutdown, StateStarting, ErrInvalidStateTransition, StateShutdown},