DevFW-CICD/garm
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Small adjustments

Browse source 
This change increases the tools refresh interval to 5 minutes, cleans
up the websocket code a bit, augments the error message that may be returned
when trying to delete a runner in an invalid state and removes a log message
that does not add much value.

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
This commit is contained in:
Gabriel Adrian Samfira 2024-01-12 19:53:27 +00:00
parent 523237ca18
commit 5b735eaaf4
4 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
runner/common/pool.go
View file

@ -27,9 +27,9 @@ const (
PoolReapTimeoutInterval = 5 * time.Minute PoolReapTimeoutInterval = 5 * time.Minute
// Temporary tools download token is valid for 1 hour by default. // Temporary tools download token is valid for 1 hour by default.
// There is no point in making an API call to get available tools, for every runner // There is no point in making an API call to get available tools, for every runner
// we spin up. We cache the tools for one minute. This should save us a lot of API calls // we spin up. We cache the tools for 5 minutes. This should save us a lot of API calls
// in cases where we have a lot of runners spin up at the same time. // in cases where we have a lot of runners spin up at the same time.
PoolToolUpdateInterval = 1 * time.Minute PoolToolUpdateInterval = 5 * time.Minute
// BackoffTimer is the time we wait before attempting to make another request // BackoffTimer is the time we wait before attempting to make another request
// to the github API. // to the github API.

6
runner/providers/external/external.go vendored
View file

@ -60,12 +60,6 @@ func (e *external) validateResult(ctx context.Context, inst commonParams.Provide
return garmErrors.NewProviderError("missing instance name") return garmErrors.NewProviderError("missing instance name")
} }
if inst.OSName == "" || inst.OSArch == "" || inst.OSType == "" {
// we can still function without this info (I think)
slog.WarnContext(
ctx, "missing OS information",
"instance", inst.Name)
}
if !IsValidProviderStatus(inst.Status) { if !IsValidProviderStatus(inst.Status) {
return garmErrors.NewProviderError("invalid status returned (%s)", inst.Status) return garmErrors.NewProviderError("invalid status returned (%s)", inst.Status)
} }

8
runner/runner.go
View file

@ -960,7 +960,13 @@ func (r *Runner) DeleteRunner(ctx context.Context, instanceName string, forceDel
case commonParams.InstanceRunning, commonParams.InstanceError, case commonParams.InstanceRunning, commonParams.InstanceError,
commonParams.InstancePendingForceDelete, commonParams.InstancePendingDelete: commonParams.InstancePendingForceDelete, commonParams.InstancePendingDelete:
default: default:
return runnerErrors.NewBadRequestError("runner must be in %q or %q state", commonParams.InstanceRunning, commonParams.InstanceError) validStates := []string{
string(commonParams.InstanceRunning),
string(commonParams.InstanceError),
string(commonParams.InstancePendingForceDelete),
string(commonParams.InstancePendingDelete),
}
return runnerErrors.NewBadRequestError("runner must be in one of the following states: %q", strings.Join(validStates, ", "))
} }
poolMgr, err := r.getPoolManagerFromInstance(ctx, instance) poolMgr, err := r.getPoolManagerFromInstance(ctx, instance)

13
websocket/websocket.go
View file

@ -127,17 +127,14 @@ func (h *Hub) Close() error {
func (h *Hub) Stop() error { func (h *Hub) Stop() error {
h.Close() h.Close()
return h.Wait()
}
func (h *Hub) Wait() error {
select { select {
case <-h.closed: case <-h.closed:
return nil
case <-time.After(60 * time.Second): case <-time.After(60 * time.Second):
return fmt.Errorf("timed out waiting for hub stop") return fmt.Errorf("timed out waiting for hub stop")
} }
} return nil
func (h *Hub) Wait() {
select {
case <-h.closed:
case <-time.After(60 * time.Second):
}
} }