Syncronize access when updating config on search layer (#16393)

* Syncronize access when updating config on search layer

* Simplify validity of race condition on tests

* Add License header on new file

* Use atomic.Value for config access on search layer

* Apply PR suggestions
Этот коммит содержится в:
John Tzikas
2020-11-25 12:23:43 +02:00
коммит произвёл GitHub
родитель bcb861717e
Коммит b375037a42
3 изменённых файлов: 55 добавлений и 4 удалений

Просмотреть файл

@@ -4,6 +4,8 @@
package searchlayer
import (
"sync/atomic"
"github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/services/searchengine"
@@ -17,15 +19,15 @@ type SearchStore struct {
team *SearchTeamStore
channel *SearchChannelStore
post *SearchPostStore
config *model.Config
configValue atomic.Value
}
func NewSearchLayer(baseStore store.Store, searchEngine *searchengine.Broker, cfg *model.Config) *SearchStore {
searchStore := &SearchStore{
Store: baseStore,
searchEngine: searchEngine,
config: cfg,
}
searchStore.configValue.Store(cfg)
searchStore.channel = &SearchChannelStore{ChannelStore: baseStore.Channel(), rootStore: searchStore}
searchStore.post = &SearchPostStore{PostStore: baseStore.Post(), rootStore: searchStore}
searchStore.team = &SearchTeamStore{TeamStore: baseStore.Team(), rootStore: searchStore}
@@ -35,7 +37,11 @@ func NewSearchLayer(baseStore store.Store, searchEngine *searchengine.Broker, cf
}
func (s *SearchStore) UpdateConfig(cfg *model.Config) {
s.config = cfg
s.configValue.Store(cfg)
}
func (s *SearchStore) getConfig() *model.Config {
return s.configValue.Load().(*model.Config)
}
func (s *SearchStore) Channel() store.ChannelStore {