镜像站点 · 本页由第三方 GitHub 只读镜像提供,非 GitHub 官方站点,不接受任何登录或凭据输入。前往 github.com
Skip to content

Software ingestion fixes (#33399) - #33467

Merged
sgress454 merged 3 commits into
rc-minor-fleet-v4.74.0from
victor/33298-cherry-pick
Sep 26, 2025
Merged

sgress454 merged 3 commits into
rc-minor-fleet-v4.74.0from
victor/33298-cherry-pick

Conversation

@getvictor

Copy link
Copy Markdown
Member

Related issue:
Resolves #29053
Resolves #33298

For reference, the diffs for merging Konstantin's changes into my original PR are here: #33390

Checklist for submitter

  • Changes file added for user-visible changes in changes/, orbit/changes/ or ee/fleetd-chrome/changes.

Testing

Summary by CodeRabbit

  • Bug Fixes

  • Fixed duplicate macOS software entries caused by users renaming apps, ensuring accurate, consolidated inventory.

  • Documentation

  • Documented improved software ingestion performance by pre-inserting data in smaller batches to reduce database lock times during host check-ins.

(cherry picked from commit 1ae9597)

<!-- Add the related story/sub-task/bug number, like Resolves #123, or
remove if NA -->
**Related issue:**
Resolves #29053
Resolves #33298

For reference, the diffs for merging Konstantin's changes into my
original PR are here: #33390

# Checklist for submitter

- [x] Changes file added for user-visible changes in `changes/`,
`orbit/changes/` or `ee/fleetd-chrome/changes`.

## Testing

- [x] Added/updated automated tests
- [x] Where appropriate, [automated tests simulate multiple hosts and
test for host
isolation](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/reference/patterns-backend.md#unit-testing)
(updates to one hosts's records do not affect another)
- [x] QA'd all new/changed functionality manually

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- Bug Fixes
- Fixed duplicate macOS software entries caused by users renaming apps,
ensuring accurate, consolidated inventory.

- Documentation
- Documented improved software ingestion performance by pre-inserting
data in smaller batches to reduce database lock times during host
check-ins.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->

(cherry picked from commit 1ae9597)
@codecov

codecov Bot commented Sep 25, 2025 •

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 84.84848% with 50 lines in your changes missing coverage. Please review.
✅ Project coverage is 63.07%. Comparing base (bd0dd18) to head (37ff287).
⚠️ Report is 5 commits behind head on rc-minor-fleet-v4.74.0.

Files with missing lines Patch % Lines
server/datastore/mysql/software.go 84.84% 34 Missing and 16 partials ⚠️
Additional details and impacted files
@@                    Coverage Diff                     @@
##           rc-minor-fleet-v4.74.0   #33467      +/-   ##
==========================================================
+ Coverage                   58.04%   63.07%   +5.03%     
==========================================================
  Files                        1335     1334       -1     
  Lines                      180831   180973     +142     
==========================================================
+ Hits                       104955   114146    +9191     
+ Misses                      66606    56833    -9773     
- Partials                     9270     9994     +724     
Flag Coverage Δ
backend 63.07% <84.84%> (+5.03%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@sgress454
sgress454 merged commit 3c363ee into rc-minor-fleet-v4.74.0 Sep 26, 2025
1 check passed
@sgress454
sgress454 deleted the victor/33298-cherry-pick branch September 26, 2025 20:54

This branch was previously deployed

1 inactive deployment
Docker Hub — 37ff2870 Deployed Sep 25, 2025 by getvictor
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Database - Long lock times and degraded performance during software ingestion. 🪲Existing macOS software names aren't fixed on software ingestion

3 participants