-
Notifications
You must be signed in to change notification settings - Fork 109
[sql-56] session: fix FeatureConfigs with an empty config set in kvdb to sql migration
#1162
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
[sql-56] session: fix FeatureConfigs with an empty config set in kvdb to sql migration
#1162
Conversation
Summary of ChangesHello @ViktorT-11, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request resolves an issue in the session migration process from Highlights
Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
FeatureConfigempty config for features in sql migFeatureConfigs with an empty config set in kvdb to sql migration
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code Review
This pull request addresses a discrepancy in how empty feature configurations are represented between the bbolt and SQL stores, which was causing migration validation failures. The introduction of the overrideFeatureConfig function to normalize the SQL representation to a non-nil empty slice is a sound approach. The changes are well-contained and accompanied by appropriate tests, including specific cases for empty and nil configs, and updates to the randomized test data. The overall implementation is correct and effectively solves the issue.
| overrideSessionTimeZone(migratedSession) | ||
| overrideMacaroonRecipe(kvSession, migratedSession) | ||
| overrideRemovedAccount(kvSession, migratedSession) | ||
| overrideFeatureConfig(kvSession, migratedSession) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Another approach would be to convert nil configs to empty ones in unmarshalFeatureConfigs. Wouldn't that be better because that way we ensure that both session (kvdb/sql) retrievals are consistent?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We discussed this offline, and we decided to continue with the override approach in favour of changing the unmarshal function. While that approach will likely work, we'll keep the same approach we've used to tackle similar issues previously, and consider to in the future instead change to the unmarshal approach. But when doing so, we'll change for all current overrides, and not just this case.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
From a call-site perspective I think it's fine to keep the nil here
lightning-terminal/session_rpcserver.go
Lines 1550 to 1555 in 5e22106
| clientConfig := make(map[string]string) | |
| if sess.FeatureConfig != nil { | |
| for k, v := range *sess.FeatureConfig { | |
| clientConfig[k] = string(v) | |
| } | |
| } |
This just leads to an empty string.
|
@ViktorT-11, remember to re-request review from reviewers when ready |
In the bbolt store, an empty config for a feature is represented as an empty array, while in for the SQL store, the same config is represented as nil. Therefore, in the scenario where a specific feature has an empty config, we override the SQL FeatureConfig for that feature to also be set to an empty array. This is needed to ensure that the deep equals check in the migration validation does not fail in this scenario.
5bd7c64 to
5e22106
Compare
| // validation does not fail in this scenario. | ||
| func overrideFeatureConfig(kvSession *Session, mSession *Session) { | ||
| // If FeatureConfig is not set for both sessions, we return early. | ||
| if kvSession.FeatureConfig == nil || mSession.FeatureConfig == nil { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this be an &&? Otherwise it could be that mSession.FeatureConfig is nil, which would panic below.
| // If the config is empty for the feature, we override | ||
| // the SQL version. | ||
| if len(config) == 0 { | ||
| migratedConf[featureName] = make([]byte, 0) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What if we erroneously migrated an empty feature config to a non-empty one, then we'd silently override the migrated one, right? So maybe we could just convert the migrated config if it is nil to an empty one?
| overrideSessionTimeZone(migratedSession) | ||
| overrideMacaroonRecipe(kvSession, migratedSession) | ||
| overrideRemovedAccount(kvSession, migratedSession) | ||
| overrideFeatureConfig(kvSession, migratedSession) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
From a call-site perspective I think it's fine to keep the nil here
lightning-terminal/session_rpcserver.go
Lines 1550 to 1555 in 5e22106
| clientConfig := make(map[string]string) | |
| if sess.FeatureConfig != nil { | |
| for k, v := range *sess.FeatureConfig { | |
| clientConfig[k] = string(v) | |
| } | |
| } |
This just leads to an empty string.
In the bbolt store, an empty config for a feature is represented as an empty array, while in for the SQL store, the same config is represented as nil. Therefore, in the scenario where a specific feature has an empty config, we override the SQL FeatureConfig for that feature to also be set to an empty array. This is needed to ensure that the deep equals check in the migration validation does not fail in this scenario.