extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-08-13 17:07:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Store setup keys and ns groups in a batch

Browse Source
This commit is contained in:
braginini
2024-04-17 18:32:13 +02:00
parent 93045f3e3a
commit 3b3aa18148
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
management/server/sqlite_store.go
View File

@ -212,6 +212,14 @@ func (s *SqliteStore) SaveAccount(account *Account) error {
accCopy.NameServerGroupsG = append(accCopy.NameServerGroupsG, *ns) accCopy.NameServerGroupsG = append(accCopy.NameServerGroupsG, *ns)
} }
accCopy.SetupKeysG = make([]SetupKey, 0, len(accCopy.SetupKeys))
for id, key := range accCopy.SetupKeys {
key.Id = id
//we need an explicit reference to the account as it is missing for some reason
key.AccountID = accCopy.Id
accCopy.SetupKeysG = append(accCopy.SetupKeysG, *key)
}
err := s.db.Transaction(func(tx *gorm.DB) error { err := s.db.Transaction(func(tx *gorm.DB) error {
result := tx.Select(clause.Associations).Delete(accCopy.Policies, "account_id = ?", accCopy.Id) result := tx.Select(clause.Associations).Delete(accCopy.Policies, "account_id = ?", accCopy.Id)
if result.Error != nil { if result.Error != nil {
@ -231,7 +239,7 @@ func (s *SqliteStore) SaveAccount(account *Account) error {
result = tx. result = tx.
Session(&gorm.Session{FullSaveAssociations: true}). Session(&gorm.Session{FullSaveAssociations: true}).
Clauses(clause.OnConflict{UpdateAll: true}). Clauses(clause.OnConflict{UpdateAll: true}).
Omit("PeersG", "GroupsG", "UsersG", "SetupKeysG", "RoutesG"). Omit("PeersG", "GroupsG", "UsersG", "SetupKeysG", "RoutesG", "NameServerGroupsG").
Create(accCopy) Create(accCopy)
if result.Error != nil { if result.Error != nil {
return result.Error return result.Error
@ -254,7 +262,11 @@ func (s *SqliteStore) SaveAccount(account *Account) error {
if err != nil { if err != nil {
return err return err
} }
return batchInsert(accCopy.SetupKeysG, batchSize, tx) err = batchInsert(accCopy.SetupKeysG, batchSize, tx)
if err != nil {
return err
}
return batchInsert(accCopy.NameServerGroupsG, batchSize, tx)
}) })
took := time.Since(start) took := time.Since(start)