agent: default restored checks to critical status

command/agent/agent.go

@@ -617,6 +617,10 @@ func (a *Agent) restoreChecks() error {
 			return err
 		}
 
+		// Default check to critical to avoid placing potentially unhealthy
+		// services into the active pool
+		check.Status = structs.HealthCritical
+
 		a.logger.Printf("[DEBUG] Restored health check: %s", check.CheckID)
 		return a.AddCheck(check, nil)
 	})

command/agent/agent_test.go

@@ -480,9 +480,13 @@ func TestAgent_PersistCheck(t *testing.T) {
 	}
 	defer agent2.Shutdown()
 
-	if _, ok := agent2.state.checks[check.CheckID]; !ok {
+	result, ok := agent2.state.checks[check.CheckID]
+	if !ok {
 		t.Fatalf("bad: %#v", agent2.state.checks)
 	}
+	if result.Status != structs.HealthCritical {
+		t.Fatalf("bad: %#v", result)
+	}
 
 	// Should remove the service file
 	if err := agent2.RemoveCheck(check.CheckID); err != nil {