Update VPP and software install status summaries and filters for unified queue #25569
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gillespi314
temporarily deployed
to
Docker Hub
GitHub Actions
Inactive
gillespi314
temporarily deployed
to
Docker Hub
GitHub Actions
Inactive
mna
reviewed
Jan 20, 2025
| case fleet.SoftwareInstallPending: | ||
| filter += " AND ua.activity_type = 'vpp_app_install'" | ||
| case fleet.SoftwareUninstallPending: | ||
| // VPP does not have uninstaller yet so to preserve existing behavior of VPP filters we map uninstall to install |
There was a problem hiding this comment.
It seems the old behaviour had SoftwarePending mapped to SoftwareInstallPending, doesn't look like it supported uninstall?
| @@ -1212,7 +1285,8 @@ WHERE | |||
| max(id) -- ensure we use only the most recent install attempt for each host | |||
| FROM host_software_installs | |||
| WHERE | |||
| software_title_id = :title_id | |||
| host_id = hsi.host_id | |||
There was a problem hiding this comment.
I think it may have been just potential inefficiency in the prior subquery rather than a bug since the subquery is still grouping by hsi.host_id and being then joined on hosts.id. This change seemed to improve the EXPLAIN when I was testing locally.
| @@ -67,35 +67,85 @@ func (ds *Datastore) GetSummaryHostVPPAppInstalls(ctx context.Context, teamID *u | |||
| ) { | |||
| var dest fleet.VPPAppStatusSummary | |||
|
|
|||
| // TODO(mna): must consider upcoming queue for pending | |||
| stmt := fmt.Sprintf(` | |||
| // TODO(uniq): do we need to handle host_deleted_at and removed similar to GetSummaryHostSoftwareInstalls? | |||
There was a problem hiding this comment.
I don't think so, see other comment above.
| AND host_id NOT IN(SELECT host_id FROM upcoming) -- antijoin to exclude hosts with upcoming activities | ||
| GROUP BY | ||
| host_id | ||
| ) |
There was a problem hiding this comment.
Really like those CTE approaches, makes it readable/maintainable.
gillespi314
temporarily deployed
to
Docker Hub
GitHub Actions
Inactive
mna
approved these changes
Jan 21, 2025
gillespi314
merged commit 029841c
into
feat-upcoming-activites-queue
9 of 23 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For #23921