Fixes #25092: Refactor CachedReportingService to make persistance simpler #5757
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
…parts Split the big CachedReportingServiceImpl into three parts: - a dumb NodeStatusReportRepository that only store/retrieve NodeStatusReports. Also add a simple implementation in memory. Latter, we will be able to persist in a psql backend storage - a ComputeNodeStatusReportService that get the logic with the queue - a FindNewNodeStatusReports that only has the logic to retrieve information for new NodeStatusReports in base from expected reports and run. Also, use that last one in CachedReportingServiceImpl - it should change nothing. Next part is to remove ReportingServiceImpl and replace it everywhere with one of the three new services.
fanf
force-pushed
the
arch_25092/refactor_cachedreportingservice_to_make_persistance_simpler
branch
from
083cfbb
to
61ee463
Compare
clarktsiory
approved these changes
Jul 4, 2024
|
OK, merging this PR |
Normation-Quality-Assistant
merged commit ec7e22b
into
Normation:master
15 checks passed
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.
https://issues.rudder.io/issues/25092
So, it seems that a lot of things are going on here, but that's not so much:
This commit splits the big
CachedReportingServiceImplinto four parts:NodeStatusReportRepositorythat only store/retrieve NodeStatusReports. Also add a simpleimplementation in memory. Latter, we will be able to persist in a psql backend storage
ReportingServiceusing previousNodeStatusReportRepository. With that and the availability ofPolicyType, it's now apparent that that service is just syntaxic sugor on top of filteringNodeStatusReports.ComputeNodeStatusReportServicethat get the logic with the queue but change nothing in it for now. It updatesNodeStatusReportRepositorywith its updates. Latter on, we will be able to add a check on expiration based on node parameter about how long to keep expired compliance.FindNewNodeStatusReportsthat only has the logic to retrieve information for new NodeStatusReportsin base from expected reports and run. The fact that it is now independant from
RepositoryServicemethod signature allows to show thatRuleId,DirectiveIdandPolicyTypeparamters are never used in it. We will be able to simplify it even further more latter on (his only job should be to retieveRunAndConfigInfo, and letComputeNodeStatusReportServicedo the computing).For now, we keep the same init logic than we had before the refactoring: there's a bootstrap action that expires all node compliance, so they are all computed back which now init the in-memory
NodeStatusReportRepository. Of course once we have that in base, we will get it from there, only asking for the missing nodes if any.Then, the commit adapt signatures where
ReportingServicewas used.It alos remove
ReportingServiceTestwhich was only comments (very useful) ; and adaptCachedReportingServiceTestto show that things still work when splitted in several pieces. One value change in that test because we don't exactly have the same call chain: now, the call to trigger a computation is explicit, and the chain is smarter on what should be updated (following https://issues.rudder.io/issues/24652 / #5737)All in all, the new code is much, much simpler and get ride of a lot of oranically-grown-not-refactored code ; and it will be rather easy to add the missing parts for persisting and not expiring compliance.