@@ -10,6 +10,7 @@ import (
1010 "github.com/coder/coder/v2/coderd/database"
1111 "github.com/coder/coder/v2/coderd/database/db2sdk"
1212 "github.com/coder/coder/v2/coderd/database/dbauthz"
13+ "github.com/coder/coder/v2/coderd/database/dbtime"
1314 "github.com/coder/coder/v2/coderd/healthcheck/health
8000
"
1415 "github.com/coder/coder/v2/coderd/provisionerdserver"
1516 "github.com/coder/coder/v2/coderd/util/apiversion"
@@ -29,13 +30,14 @@ type ProvisionerDaemonsReport struct {
2930}
3031
3132type ProvisionerDaemonsReportDeps struct {
33+ // Required
3234 CurrentVersion string
3335 CurrentAPIMajorVersion int
36+ Store ProvisionerDaemonsStore
3437
35- Store ProvisionerDaemonsStore
36-
37- TimeNowFn func () time.Time
38- StaleInterval time.Duration
38+ // Optional
39+ TimeNowFn func () time.Time // Defaults to dbtime.Now
40+ StaleInterval time.Duration // Defaults to 3 heartbeats
3941
4042 Dismissed bool
4143}
@@ -49,7 +51,12 @@ func (r *ProvisionerDaemonsReport) Run(ctx context.Context, opts *ProvisionerDae
4951 r .Severity = health .SeverityOK
5052 r .Warnings = make ([]health.Message , 0 )
5153 r .Dismissed = opts .Dismissed
54+
55+ if opts .TimeNowFn == nil {
56+ opts .TimeNowFn = dbtime .Now
57+ }
5258 now := opts .TimeNowFn ()
59+
5360 if opts .StaleInterval == 0 {
5461 opts .StaleInterval = provisionerdserver .DefaultHeartbeatInterval * 3
5562 }
@@ -79,17 +86,6 @@ func (r *ProvisionerDaemonsReport) Run(ctx context.Context, opts *ProvisionerDae
7986 r .Error = ptr .Ref ("error fetching provisioner daemons: " + err .Error ())
8087 return
8188 }
82-
83- for _ , daemon := range daemons {
84- r .ProvisionerDaemons = append (r .ProvisionerDaemons , db2sdk .ProvisionerDaemon (daemon ))
85- }
86-
87- if len (r .ProvisionerDaemons ) == 0 {
88- r .Severity = health .SeverityError
89- r .Error = ptr .Ref ("No provisioner daemons found!" )
90- return
91- }
92-
9389 for _ , daemon := range daemons {
9490 // Daemon never connected, skip.
9591 if ! daemon .LastSeenAt .Valid {
@@ -99,6 +95,9 @@ func (r *ProvisionerDaemonsReport) Run(ctx context.Context, opts *ProvisionerDae
9995 if now .Sub (daemon .LastSeenAt .Time ) > (opts .StaleInterval ) {
10096 continue
10197 }
98+
99+ r .ProvisionerDaemons = append (r .ProvisionerDaemons , db2sdk .ProvisionerDaemon (daemon ))
100+
102101 // For release versions, just check MAJOR.MINOR and ignore patch.
103102 if ! semver .IsValid (daemon .Version ) {
104103 if r .Severity .Value () < health .SeverityError .Value () {
@@ -128,4 +127,10 @@ func (r *ProvisionerDaemonsReport) Run(ctx context.Context, opts *ProvisionerDae
128127 r .Warnings = append (r .Warnings , health .Messagef (health .CodeProvisionerDaemonAPIMajorVersionDeprecated , "Provisioner daemon %q reports deprecated major API version %d. Consider upgrading!" , daemon .Name , provisionersdk .CurrentMajor ))
129128 }
130129 }
130+
131+ if len (r .ProvisionerDaemons ) == 0 {
132+ r .Severity = health .SeverityError
133+ r .Error = ptr .Ref ("No active provisioner daemons found!" )
134+ return
135+ }
131136}
0 commit comments