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

Wait for deletePendingInstances() to finish

Browse source 
Use an errgroup to wait for all instance deletion operations before
returning. Log any failure.

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
This commit is contained in:
Gabriel Adrian Samfira 2023-06-06 16:36:08 +03:00
parent 05a79d298c
commit e9f66c2035
No known key found for this signature in database
GPG key ID: 7D073DCC2C074CB5
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
runner/pool/pool.go
View file

@ -1021,7 +1021,7 @@ func (r *basePoolManager) deletePendingInstances() {
log.Printf("failed to fetch instances from store: %s", err)
return
}
g, ctx := errgroup.WithContext(r.ctx)
for _, instance := range instances {
if instance.Status != providerCommon.InstancePendingDelete {
// not in pending_delete status. Skip.
@ -1033,7 +1033,8 @@ func (r *basePoolManager) deletePendingInstances() {
if err := r.setInstanceStatus(instance.Name, providerCommon.InstanceDeleting, nil); err != nil {
log.Printf("failed to update runner %s status", instance.Name)
}
go func(instance params.Instance) (err error) {
instance := instance
g.Go(func() (err error) {
defer func(instance params.Instance) {
if err != nil {
// failed to remove from provider. Set the status back to pending_delete, which
@ -1049,11 +1050,14 @@ func (r *basePoolManager) deletePendingInstances() {
return errors.Wrap(err, "removing instance from provider")
}
if deleteErr := r.store.DeleteInstance(r.ctx, instance.PoolID, instance.Name); deleteErr != nil {
if deleteErr := r.store.DeleteInstance(ctx, instance.PoolID, instance.Name); deleteErr != nil {
return errors.Wrap(deleteErr, "deleting instance from database")
}
return
}(instance) //nolint
})
}
if err := g.Wait(); err != nil {
log.Printf("failed to delete pending instances: %s", err)
}
}