Ensure declined engines don't have engine records in meta/global #1866
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
|
r?markh since he might know more of the context behind what desktop actually expects... |
|
Okay, I'm pretty sure the confusion is that desktop does remove things from the |
|
I think this might be it—if it's disabled locally, it gets removed from m/g's |
|
Nice catch, you're right! |
linabutler
approved these changes
Sep 25, 2019
| log::info!( | ||
| "Uploading new declined {:?} to meta/global with timestamp {:?}", | ||
| global.declined, | ||
| global_timestamp, | ||
| ); | ||
| global.declined = result.declined.iter().cloned().collect(); |
There was a problem hiding this comment.
Oops, good catch on this, too!
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.
AFAICT desktop doesn't delete these when an engine is declined, but it does expect other clients to do so.
Something can't be right there, but this is a fix that ensures meta/global doesn't have any engine records for declined engines, which seems to be what https://searchfox.org/mozilla-central/source/services/sync/modules/stages/enginesync.js#268 expects.
It also fixes a bad log statement, and avoids logging a struct that contains sensitive data.
CC @grigoryk