Skip to content

[RS] Run maintenance after each sync (backport #7342)#7352

Open
mergify[bot] wants to merge 2 commits intorelease-v151from
mergify/bp/release-v151/pr-7342
Open

[RS] Run maintenance after each sync (backport #7342)#7352
mergify[bot] wants to merge 2 commits intorelease-v151from
mergify/bp/release-v151/pr-7342

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented May 6, 2026

Pull Request checklist

  • Breaking changes: This PR follows our breaking change policy
    • This PR follows the breaking change policy:
      • This PR has no breaking API changes, or
      • There are corresponding PRs for our consumer applications that resolve the breaking changes and have been approved
  • Quality: This PR builds and tests run cleanly
    • Note:
      • For changes that need extra cross-platform testing, consider adding [ci full] to the PR title.
      • If this pull request includes a breaking change, consider cutting a new release after merging.
  • Tests: This PR includes thorough tests or an explanation of why it does not
  • Changelog: This PR includes a changelog entry in CHANGELOG.md or an explanation of why it does not need one
    • Any breaking changes to Swift or Kotlin binding APIs are noted explicitly
  • Dependencies: This PR follows our dependency management guidelines
    • Any new dependencies are accompanied by a summary of the due diligence applied in selecting them.

This is an automatic backport of pull request #7342 done by [Mergify](https://mergify.com).

* feat: add run_maintenance method to storage

* feat: call run_maintenance after sync

* fix: keep a ref to active_clients

* chore: add test that fails on old behavior

* fix: lint

* fix: actually fix clippy

(cherry picked from commit 903526a)

# Conflicts:
#	components/remote_settings/src/service.rs
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented May 6, 2026

Cherry-pick of 903526a has failed:

On branch mergify/bp/release-v151/pr-7342
Your branch is up to date with 'origin/release-v151'.

You are currently cherry-picking commit 903526a2.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   components/remote_settings/src/client.rs
	modified:   components/remote_settings/src/storage.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   components/remote_settings/src/service.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify Bot added the conflicts label May 6, 2026
@mergify mergify Bot mentioned this pull request May 6, 2026
5 tasks
@issammani issammani self-requested a review May 6, 2026 19:26
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.

1 participant