Adapt is execution pending on host check

fleetdm · Jan 7, 2025 · 6fa982b · 6fa982b
1 parent 68b9ec4
commit 6fa982b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/server/datastore/mysql/scripts.go b/server/datastore/mysql/scripts.go
@@ -314,10 +314,19 @@ func (ds *Datastore) IsExecutionPendingForHost(ctx context.Context, hostID uint,
 		  host_id = ? AND
 		  script_id = ? AND
 		  exit_code IS NULL
+		UNION
+		SELECT
+			1
+		FROM
+			upcoming_activities
+		WHERE
+			host_id = ? AND
+			activity_type = 'script' AND
+			script_id = ?
 	`
 
 	var results []*uint
-	if err := sqlx.SelectContext(ctx, ds.reader(ctx), &results, getStmt, hostID, scriptID); err != nil {
+	if err := sqlx.SelectContext(ctx, ds.reader(ctx), &results, getStmt, hostID, scriptID, hostID, scriptID); err != nil {
 		return false, ctxerr.Wrap(ctx, err, "is execution pending for host")
 	}
 	return len(results) > 0, nil

diff --git a/server/service/osquery.go b/server/service/osquery.go
@@ -1984,7 +1984,6 @@ func (svc *Service) processScriptsForNewlyFailingPolicies(
 			continue
 		}
 
-		// TODO(mna): this has to look both in host_script_results and the upcoming queue
 		scriptIsAlreadyPending, err := svc.ds.IsExecutionPendingForHost(ctx, hostID, scriptMetadata.ID)
 		if err != nil {
 			return ctxerr.Wrap(ctx, err, "check whether script is pending execution")

diff --git a/server/service/scripts.go b/server/service/scripts.go
@@ -249,7 +249,6 @@ func (svc *Service) RunHostScript(ctx context.Context, request *fleet.HostScript
 			return nil, fleet.NewInvalidArgumentError("script_id", `The script does not belong to the same team (or no team) as the host.`)
 		}
 
-		// TODO(mna): must look in host_script_results and the upcoming queue
 		isQueued, err := svc.ds.IsExecutionPendingForHost(ctx, request.HostID, *request.ScriptID)
 		if err != nil {
 			return nil, err