WIP: nick.farrell 02/10/25 11:24 fedora

Author: nicois

plugin/plugin.go

@@ -168,11 +168,6 @@ func (t *TargetPlugin) Scale(action sdk.ScalingAction, config map[string]string)
 		return fmt.Errorf("failed to describe DigitalOcedroplets: %w", err)
 	}
 
-	debounce("deleteOrphanedDroplets", func() {
-		t.logger.Info("performing periodic check for orphaned droplets")
-		deleteOrphanedDroplets(ctx, t.logger, t.client.Droplets(), t.getReadyNomadClients, template)
-	}, time.Minute*10)
-
 	diff, direction := t.calculateDirection(total, action.Count)
 
 	switch direction {
@@ -214,6 +209,15 @@ func (t *TargetPlugin) Status(config map[string]string) (*sdk.TargetStatus, erro
 		return nil, err
 	}
 
+	// If it's been at least 10 minutes since the last check for orphaned
+	// droplets, run one now (in a separate goroutine)
+	go debounce("deleteOrphanedDroplets", func() {
+		t.logger.Info("performing periodic check for orphaned droplets")
+		ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
+		defer cancel()
+		deleteOrphanedDroplets(ctx, t.logger, t.client.Droplets(), t.getReadyNomadClients, template)
+	}, time.Minute*10)
+
 	total, active, err := t.countDroplets(t.ctx, template)
 	if err != nil {
 		return nil, fmt.Errorf("failed to describe DigitalOcean droplets: %w", err)

plugin/utils.go

@@ -50,6 +50,6 @@ func debounce(key string, fn func(), period time.Duration) {
 			return
 		}
 	}
-	go fn()
+	fn()
 	debounceMap[key] = time.Now()
 }