status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(communities/manager): use sync.map to fix concurrent map writes err (#3445)

This commit is contained in:
Jonathan Rainville 2023-05-05 14:13:55 -04:00 committed by GitHub
parent b7767ea63c
commit edf8869ff2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
0.150.0 0.150.1

31
protocol/communities/manager.go
View File

@ -76,7 +76,7 @@ type Manager struct {
walletConfig *params.WalletConfig walletConfig *params.WalletConfig
historyArchiveTasksWaitGroup sync.WaitGroup historyArchiveTasksWaitGroup sync.WaitGroup
historyArchiveTasks sync.Map // stores `chan struct{}` historyArchiveTasks sync.Map // stores `chan struct{}`
periodicMemberPermissionsTasks map[string]chan struct{} periodicMemberPermissionsTasks sync.Map // stores `chan struct{}`
torrentTasks map[string]metainfo.Hash torrentTasks map[string]metainfo.Hash
historyArchiveDownloadTasks map[string]*HistoryArchiveDownloadTask historyArchiveDownloadTasks map[string]*HistoryArchiveDownloadTask
} }
@ -150,16 +150,15 @@ func NewManager(identity *ecdsa.PrivateKey, db *sql.DB, encryptor *encryption.Pr
} }
manager := &Manager{ manager := &Manager{
logger: logger, logger: logger,
stdoutLogger: stdoutLogger, stdoutLogger: stdoutLogger,
encryptor: encryptor, encryptor: encryptor,
identity: identity, identity: identity,
quit: make(chan struct{}), quit: make(chan struct{}),
transport: transport, transport: transport,
torrentConfig: torrentConfig, torrentConfig: torrentConfig,
periodicMemberPermissionsTasks: make(map[string]chan struct{}), torrentTasks: make(map[string]metainfo.Hash),
torrentTasks: make(map[string]metainfo.Hash), historyArchiveDownloadTasks: make(map[string]*HistoryArchiveDownloadTask),
historyArchiveDownloadTasks: make(map[string]*HistoryArchiveDownloadTask),
persistence: &Persistence{ persistence: &Persistence{
logger: logger, logger: logger,
db: db, db: db,
@ -618,12 +617,12 @@ func (m *Manager) checkMemberPermissions(communityID types.HexBytes) error {
func (m *Manager) CheckMemberPermissionsPeriodically(communityID types.HexBytes) { func (m *Manager) CheckMemberPermissionsPeriodically(communityID types.HexBytes) {
if _, exists := m.periodicMemberPermissionsTasks[communityID.String()]; exists { if _, exists := m.periodicMemberPermissionsTasks.Load(communityID.String()); exists {
return return
} }
cancel := make(chan struct{}) cancel := make(chan struct{})
m.periodicMemberPermissionsTasks[communityID.String()] = cancel m.periodicMemberPermissionsTasks.Store(communityID.String(), cancel)
ticker := time.NewTicker(memberPermissionsCheckInterval) ticker := time.NewTicker(memberPermissionsCheckInterval)
defer ticker.Stop() defer ticker.Stop()
@ -636,7 +635,7 @@ func (m *Manager) CheckMemberPermissionsPeriodically(communityID types.HexBytes)
m.logger.Debug("failed to check member permissions", zap.Error(err)) m.logger.Debug("failed to check member permissions", zap.Error(err))
} }
case <-cancel: case <-cancel:
delete(m.periodicMemberPermissionsTasks, communityID.String()) m.periodicMemberPermissionsTasks.Delete(communityID.String())
return return
} }
} }
@ -665,8 +664,8 @@ func (m *Manager) DeleteCommunityTokenPermission(request *requests.DeleteCommuni
// if not we can stop checking token criteria on-chain // if not we can stop checking token criteria on-chain
// for members // for members
becomeMemberPermissions := community.TokenPermissionsByType(protobuf.CommunityTokenPermission_BECOME_MEMBER) becomeMemberPermissions := community.TokenPermissionsByType(protobuf.CommunityTokenPermission_BECOME_MEMBER)
if cancel, exists := m.periodicMemberPermissionsTasks[community.IDString()]; exists && len(becomeMemberPermissions) == 0 { if cancel, exists := m.periodicMemberPermissionsTasks.Load(community.IDString()); exists && len(becomeMemberPermissions) == 0 {
close(cancel) close(cancel.(chan struct{})) // Need to cast to the chan
} }
m.publish(&Subscription{Community: community}) m.publish(&Subscription{Community: community})