libnet: Controller: more c.store clean-ups #47820
Merged
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
akerouanton
added
area/networking
kind/refactor
thaJeztah
reviewed
May 10, 2024
| @@ -105,15 +105,15 @@ func (ec *endpointCnt) EndpointCnt() uint64 { | |||
| } | |||
|
|
|||
| func (ec *endpointCnt) updateStore() error { | |||
| store := ec.n.getController().getStore() | |||
There was a problem hiding this comment.
This also removes the getController() part, which does appear to have synchronisation; is it safe to skip it here?
At least at a quick glance, it looks like there's potential paths that mutate that field, so maybe we still need it?
There was a problem hiding this comment.
It's safe to remove this call -- there's no way n.ctrler can be mutated once the network is loaded from the datastore. But I've undone this change and will do that in a separate commit / PR.
This was done in a separate method, called by the ctrler constructor. This method was returning a nil datastore when c.cfg was nil -- but that can't happen in practice! This was giving the impression that the controller could be run without a datastore properly configured. It's not the case, so make it explicit by instantiating the datastore before `Controller`. Signed-off-by: Albin Kerouanton <[email protected]>
Previous commit made it clear that c.store can't be nil. Hence, `c.store.Close()` can be called without checking if c.store is nil. Signed-off-by: Albin Kerouanton <[email protected]>
This method does nothing more than `return c.store`. It has no value and adds an unecessary level of indirection. Let's ditch it. Signed-off-by: Albin Kerouanton <[email protected]>
akerouanton
force-pushed
the
libnet-store-is-never-nil-followup
branch
from
9583539
to
6d21574
Compare
robmry
approved these changes
May 21, 2024
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.
libnet: init datastore in ctrler constructor
This was done in a separate method, called by the ctrler constructor.
This method was returning a nil datastore when c. cfg was nil -- but that can't happen in practice!
This was giving the impression the controller could be run without a datastore properly configured. It's not the case, so make it explicit by instantiating the datastore before
Controller.libnet: Controller: drop closeStores
Previous commit made it clear that c.store can't be nil. Hence,
c.store.Close()can be called without checking if c.store is nil.libnet: Controller: drop getStore()
This method does nothing more than
return c.store. It has no value and adds an unecessary level of indirection. Let's ditch it.- How I did it
Static analysis.
- How to verify it
CI.
- A picture of a cute animal (not mandatory but encouraged)