[management] Refactor peers to use store methods #2893
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
Signed-off-by: bcmmbaga <[email protected]>
Signed-off-by: bcmmbaga <[email protected]>
Signed-off-by: bcmmbaga <[email protected]>
Signed-off-by: bcmmbaga <[email protected]>
Signed-off-by: bcmmbaga <[email protected]>
Signed-off-by: bcmmbaga <[email protected]>
Signed-off-by: bcmmbaga <[email protected]>
Signed-off-by: bcmmbaga <[email protected]>
Signed-off-by: bcmmbaga <[email protected]>
…unt-refactoring # Conflicts: # management/server/sql_store.go
…nt-refactoring # Conflicts: # management/server/sql_store.go
Signed-off-by: bcmmbaga <[email protected]>
Signed-off-by: bcmmbaga <[email protected]>
Signed-off-by: bcmmbaga <[email protected]>
Signed-off-by: bcmmbaga <[email protected]>
Signed-off-by: bcmmbaga <[email protected]>
Signed-off-by: bcmmbaga <[email protected]>
Signed-off-by: bcmmbaga <[email protected]>
Signed-off-by: bcmmbaga <[email protected]>
# Conflicts: # management/server/group.go # management/server/group/group.go # management/server/setupkey.go # management/server/sql_store.go # management/server/status/error.go # management/server/store.go
Signed-off-by: bcmmbaga <[email protected]>
Signed-off-by: bcmmbaga <[email protected]>
Signed-off-by: bcmmbaga <[email protected]>
Signed-off-by: bcmmbaga <[email protected]>
Signed-off-by: bcmmbaga <[email protected]>
Signed-off-by: bcmmbaga <[email protected]>
Signed-off-by: bcmmbaga <[email protected]>
…account-refactoring
Signed-off-by: bcmmbaga <[email protected]>
Signed-off-by: bcmmbaga <[email protected]>
Signed-off-by: bcmmbaga <[email protected]>
bcmmbaga
force-pushed
the
peers-get-account-refactoring
branch
2 times, most recently
from
e8a5d16
to
9950683
Compare
Signed-off-by: bcmmbaga <[email protected]>
bcmmbaga
force-pushed
the
peers-get-account-refactoring
branch
from
9950683
to
20fc8e8
Compare
Signed-off-by: bcmmbaga <[email protected]>
bcmmbaga
force-pushed
the
peers-get-account-refactoring
branch
from
21f57c0
to
4abf9ad
Compare
Signed-off-by: bcmmbaga <[email protected]>
bcmmbaga
force-pushed
the
peers-get-account-refactoring
branch
from
4abf9ad
to
82746d9
Compare
# Conflicts: # management/server/policy.go # management/server/posture_checks_test.go # management/server/sql_store.go # management/server/sql_store_test.go # management/server/status/error.go # management/server/store.go # management/server/testdata/extended-store.sql
# Conflicts: # management/server/sql_store_test.go # management/server/status/error.go # management/server/testdata/extended-store.sql
…unt-refactoring # Conflicts: # management/server/account.go # management/server/http/peers_handler.go # management/server/peer.go
# Conflicts: # management/server/sql_store_test.go
… user peers with empty userID Signed-off-by: bcmmbaga <[email protected]>
Signed-off-by: bcmmbaga <[email protected]>
Signed-off-by: bcmmbaga <[email protected]>
pascal-fischer
requested changes
Nov 28, 2024
management/server/account.go
Outdated
Comment on lines
1285
to
1286
| unlock := am.Store.AcquireWriteLockByUID(ctx, accountID) | ||
| defer unlock() |
There was a problem hiding this comment.
don't remove the lock just yet
management/server/ephemeral.go
Outdated
Comment on lines
131
to
134
| for _, p := range peers { | ||
| if p.Ephemeral { | ||
| count++ | ||
| e.addPeer(p.AccountID, p.ID, t) |
There was a problem hiding this comment.
the DB call already returns ephemeral peers. No need for the if and the counter, we can go Len(peers)
Comment on lines
197
to
203
|
|
||
| peerGroups, err := h.accountManager.GetPeerGroups(r.Context(), accountID, peer.ID) | ||
| if err != nil { | ||
| util.WriteError(r.Context(), err, w) | ||
| return | ||
| } | ||
| groupMinimumInfo := toGroupsInfo(peerGroups) |
There was a problem hiding this comment.
I wonder if it makes sense here to keep get getAllGroups approach. As the method is getAllPeers, we will probably also need close to all groups. So I would keep it as one call
Comment on lines
+84
to
+97
| err = am.Store.ExecuteInTransaction(ctx, func(transaction Store) error { | ||
| groups, err = transaction.GetAccountGroups(ctx, LockingStrengthShare, accountID) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| peers, err = transaction.GetAccountPeers(ctx, LockingStrengthShare, accountID) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| settings, err = transaction.GetAccountSettings(ctx, LockingStrengthShare, accountID) | ||
| return err | ||
| }) |
There was a problem hiding this comment.
Not sure how much effect this transaction will have but should not hurt either
There was a problem hiding this comment.
I was waiting for #2957 to measure the performance, but I am already planning to continue passing the account object instead of db calls, since all the methods calling this have access to the account object
Signed-off-by: bcmmbaga <[email protected]>
Signed-off-by: bcmmbaga <[email protected]>
# Conflicts: # management/server/peer.go
Signed-off-by: bcmmbaga <[email protected]>
|
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.
Describe your changes
Remove calls to get and save whole account in peers operations.
Issue ticket number and link
Checklist