Clear stale broken label rows on profile batch upsert - #44847
Merged
Conversation
When a label referenced by an MDM configuration profile was deleted, mdm_configuration_profile_labels.label_id was set to NULL via the FK ON DELETE SET NULL. The cleanup DELETE in batchSetProfileLabelAssociationsDB used `(profile_uuid, label_id) NOT IN (...)`, which under MySQL three-valued logic evaluates to NULL for rows with label_id IS NULL — so broken rows survived every subsequent gitops apply. generateEntitiesToRemoveQuery treats any profile with a NULL label_id row as broken and refuses to schedule its removal from hosts. Result: profiles stayed enforced on previously-targeted hosts regardless of updated YAML targeting. Also clear rows with label_id IS NULL for profiles in the current batch. The safety net for the in-between window (label deleted out-of-band, no batch-set yet) still works since the cleanup only runs when the user explicitly sets a profile's label associations.
![claude[bot]](https://avatars.githubusercontent.com/in/1236702?s=60&v=4){kind=small}
There was a problem hiding this comment.
Claude Code Review
This repository is configured for manual code reviews. Comment @claude review to trigger a review and subscribe this PR to future pushes, or @claude review once for a one-time review.
Tip: disable this comment in your organization's Code Review settings.
Contributor
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (4)
WalkthroughThe changes fix an issue where stale broken label associations were not being cleared when batch-setting MDM profiles. The deletion logic in 🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
CI Feedback 🧐A test triggered by this PR failed. Here is an AI-generated analysis of the failure:
|
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #44847 +/- ##
==========================================
+ Coverage 66.68% 66.70% +0.01%
==========================================
Files 2665 2667 +2
Lines 214783 215275 +492
Branches 9759 9759
==========================================
+ Hits 143227 143589 +362
- Misses 58521 58613 +92
- Partials 13035 13073 +38
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
juan-fdz-hawa
approved these changes
May 7, 2026
1 task
4 tasks
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Related issue: Resolves #42637
Checklist for submitter
changes/,orbit/changes/oree/fleetd-chrome/changes.See Changes files for more information.
Testing
Added/updated automated tests
QA'd all new/changed functionality manually
Reproduction steps:
label_idto NULL.Testing steps
Summary by CodeRabbit
Bug Fixes