sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-04-21 09:46:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "use FullSaveAssociations for single group save"

Browse Source 
This reverts commit 76b180a741.
This commit is contained in:
Pascal Fischer
2025-07-04 10:16:41 +02:00
parent 76b180a741
commit b329397d06
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
management/server/store/sql_store.go
View File

@@ -463,7 +463,7 @@ func (s *SqlStore) SaveGroups(ctx context.Context, lockStrength LockingStrength,
g.StoreGroupPeers()
}
return s.db.Session(&gorm.Session{FullSaveAssociations: true}).Transaction(func(tx *gorm.DB) error {
return s.db.Transaction(func(tx *gorm.DB) error {
result := tx.
Clauses(
clause.Locking{Strength: string(lockStrength)},
@@ -1831,11 +1831,22 @@ func (s *SqlStore) SaveGroup(ctx context.Context, lockStrength LockingStrength,
group = group.Copy()
group.StoreGroupPeers()
if err := s.db.Session(&gorm.Session{FullSaveAssociations: true}).Save(group).Error; err != nil {
if err := s.db.Omit(clause.Associations).Save(group).Error; err != nil {
log.WithContext(ctx).Errorf("failed to save group to store: %v", err)
return status.Errorf(status.Internal, "failed to save group to store")
}
if len(group.GroupPeers) == 0 {
if err := s.db.Where("group_id = ?", group.ID).Delete(&types.GroupPeer{}).Error; err != nil {
log.WithContext(ctx).Errorf("failed to delete group peers for group %s: %s", group.ID, err)
return status.Errorf(status.Internal, "failed to delete group peers")
}
} else {
if err := s.db.Model(&group).Association("GroupPeers").Replace(group.GroupPeers); err != nil {
return status.Errorf(status.Internal, "failed to save group peers: %s", err)
}
}
return nil
}