Skip to content

Log error when host_script_result record is not found #40009

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nulmete merged 2 commits into from
Feb 18, 2026
Merged

Log error when host_script_result record is not found #40009

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7748a2
Log error when host_script_result record is not found
nulmete Feb 18, 2026
8a46abf
tweak logging
nulmete Feb 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions server/datastore/mysql/scripts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1526,17 +1526,23 @@ func (ds *Datastore) GetHostLockWipeStatus(ctx context.Context, host *fleet.Host
// lock and unlock references are scripts
if mdmActions.LockRef != nil {
hsr, err := ds.getHostScriptExecutionResultDB(ctx, ds.reader(ctx), *mdmActions.LockRef, scriptExecutionSearchOpts{IncludeCanceled: true})
if err != nil {
if err != nil && !fleet.IsNotFound(err) {
return nil, ctxerr.Wrap(ctx, err, "get lock reference script result")
}
if fleet.IsNotFound(err) {
level.Error(ds.logger).Log("msg", "orphan lock script execution reference", "host_id", host.ID, "execution_id", *mdmActions.LockRef)
}
status.LockScript = hsr
}

if mdmActions.UnlockRef != nil {
hsr, err := ds.getHostScriptExecutionResultDB(ctx, ds.reader(ctx), *mdmActions.UnlockRef, scriptExecutionSearchOpts{IncludeCanceled: true})
if err != nil {
if err != nil && !fleet.IsNotFound(err) {
return nil, ctxerr.Wrap(ctx, err, "get unlock reference script result")
}
if fleet.IsNotFound(err) {
level.Error(ds.logger).Log("msg", "orphan unlock script execution reference", "host_id", host.ID, "execution_id", *mdmActions.UnlockRef)
}
status.UnlockScript = hsr
}

Expand All @@ -1551,9 +1557,12 @@ func (ds *Datastore) GetHostLockWipeStatus(ctx context.Context, host *fleet.Host
status.WipeMDMCommandResult = cmdRes
} else {
hsr, err := ds.getHostScriptExecutionResultDB(ctx, ds.reader(ctx), *mdmActions.WipeRef, scriptExecutionSearchOpts{IncludeCanceled: true})
if err != nil {
if err != nil && !fleet.IsNotFound(err) {
return nil, ctxerr.Wrap(ctx, err, "get wipe reference script result")
}
if fleet.IsNotFound(err) {
level.Error(ds.logger).Log("msg", "orphan wipe script execution reference", "host_id", host.ID, "execution_id", *mdmActions.WipeRef)
}
status.WipeScript = hsr
}
}
Expand Down
Loading