mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

Removing certain unneded cluster invalidation messages (#13549)

Просмотр исходного кода 
* Removing certain unneded cluster invalidation messages

* Fixing typo

* Removing channges included in other PR

* Adding doc string to RegisterAllClusterMessageHandlers method

* fixing typos

Co-authored-by: mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
Jesús Espino
2020-01-08 11:31:10 +01:00
коммит произвёл GitHub
родитель bd480b70f3
Коммит 464c290e50
9 изменённых файлов: 138 добавлений и 61 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
app/cluster_handlers.go
Просмотреть файл

@@ -9,12 +9,15 @@ import (
"github.com/mattermost/mattermost-server/v5/model"
)
// RegisterAllClusterMessageHandlers registers the cluster message handlers that are handled by the App layer.
//
// The cluster event handlers are spread across this function and
// NewLocalCacheLayer. Be careful to not have duplicated handlers here and
// there.
func (a *App) RegisterAllClusterMessageHandlers() {
a.Cluster.RegisterClusterMessageHandler(model.CLUSTER_EVENT_PUBLISH, a.ClusterPublishHandler)
a.Cluster.RegisterClusterMessageHandler(model.CLUSTER_EVENT_UPDATE_STATUS, a.ClusterUpdateStatusHandler)
a.Cluster.RegisterClusterMessageHandler(model.CLUSTER_EVENT_INVALIDATE_ALL_CACHES, a.ClusterInvalidateAllCachesHandler)
a.Cluster.RegisterClusterMessageHandler(model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_WEBHOOK, a.ClusterInvalidateCacheForWebhookHandler)
a.Cluster.RegisterClusterMessageHandler(model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_CHANNEL_POSTS, a.ClusterInvalidateCacheForChannelPostsHandler)
a.Cluster.RegisterClusterMessageHandler(model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_CHANNEL_MEMBERS_NOTIFY_PROPS, a.ClusterInvalidateCacheForChannelMembersNotifyPropHandler)
a.Cluster.RegisterClusterMessageHandler(model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_CHANNEL_MEMBERS, a.ClusterInvalidateCacheForChannelMembersHandler)
a.Cluster.RegisterClusterMessageHandler(model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_CHANNEL_BY_NAME, a.ClusterInvalidateCacheForChannelByNameHandler)
@@ -25,7 +28,6 @@ func (a *App) RegisterAllClusterMessageHandlers() {
a.Cluster.RegisterClusterMessageHandler(model.CLUSTER_EVENT_INSTALL_PLUGIN, a.ClusterInstallPluginHandler)
a.Cluster.RegisterClusterMessageHandler(model.CLUSTER_EVENT_REMOVE_PLUGIN, a.ClusterRemovePluginHandler)
a.Cluster.RegisterClusterMessageHandler(model.CLUSTER_EVENT_BUSY_STATE_CHANGED, a.ClusterBusyStateChgHandler)
}
func (a *App) ClusterPublishHandler(msg *model.ClusterMessage) {
@@ -42,14 +44,6 @@ func (a *App) ClusterInvalidateAllCachesHandler(msg *model.ClusterMessage) {
a.InvalidateAllCachesSkipSend()
}
func (a *App) ClusterInvalidateCacheForWebhookHandler(msg *model.ClusterMessage) {
a.InvalidateCacheForWebhookSkipClusterSend(msg.Data)
}
func (a *App) ClusterInvalidateCacheForChannelPostsHandler(msg *model.ClusterMessage) {
a.InvalidateCacheForChannelPostsSkipClusterSend(msg.Data)
}
func (a *App) ClusterInvalidateCacheForChannelMembersNotifyPropHandler(msg *model.ClusterMessage) {
a.InvalidateCacheForChannelMembersNotifyPropsSkipClusterSend(msg.Data)
}

37
app/web_hub.go
Просмотреть файл

@@ -225,6 +225,8 @@ func (a *App) InvalidateCacheForChannel(channel *model.Channel) {
func (a *App) InvalidateCacheForChannelMembers(channelId string) {
a.InvalidateCacheForChannelMembersSkipClusterSend(channelId)
a.Srv.Store.Channel().InvalidateMemberCount(channelId)
a.Srv.Store.Channel().InvalidateGuestCount(channelId)
if a.Cluster != nil {
msg := &model.ClusterMessage{
@@ -238,8 +240,6 @@ func (a *App) InvalidateCacheForChannelMembers(channelId string) {
func (a *App) InvalidateCacheForChannelMembersSkipClusterSend(channelId string) {
a.Srv.Store.User().InvalidateProfilesInChannelCache(channelId)
a.Srv.Store.Channel().InvalidateMemberCount(channelId)
a.Srv.Store.Channel().InvalidateGuestCount(channelId)
}
func (a *App) InvalidateCacheForChannelMembersNotifyProps(channelId string) {
@@ -268,21 +268,8 @@ func (a *App) InvalidateCacheForChannelByNameSkipClusterSend(teamId, name string
}
func (a *App) InvalidateCacheForChannelPosts(channelId string) {
a.InvalidateCacheForChannelPostsSkipClusterSend(channelId)
if a.Cluster != nil {
msg := &model.ClusterMessage{
Event: model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_CHANNEL_POSTS,
SendType: model.CLUSTER_SEND_BEST_EFFORT,
Data: channelId,
}
a.Cluster.SendClusterMessage(msg)
}
}
func (a *App) InvalidateCacheForChannelPostsSkipClusterSend(channelId string) {
a.Srv.Store.Post().InvalidateLastPostTimeCache(channelId)
a.Srv.Store.Channel().InvalidatePinnedPostCount(channelId)
a.Srv.Store.Post().InvalidateLastPostTimeCache(channelId)
}
func (a *App) InvalidateCacheForUser(userId string) {
@@ -300,6 +287,7 @@ func (a *App) InvalidateCacheForUser(userId string) {
func (a *App) InvalidateCacheForUserTeams(userId string) {
a.InvalidateCacheForUserTeamsSkipClusterSend(userId)
a.Srv.Store.Team().InvalidateAllTeamIdsForUser(userId)
if a.Cluster != nil {
msg := &model.ClusterMessage{
@@ -314,7 +302,7 @@ func (a *App) InvalidateCacheForUserTeams(userId string) {
func (a *App) InvalidateCacheForUserSkipClusterSend(userId string) {
a.Srv.Store.Channel().InvalidateAllChannelMembersForUser(userId)
a.Srv.Store.User().InvalidateProfilesInChannelCacheByUser(userId)
a.Srv.Store.User().InvalidatProfileCacheForUser(userId)
a.Srv.Store.User().InvalidateProfileCacheForUser(userId)
hub := a.GetHubForUserId(userId)
if hub != nil {
@@ -323,8 +311,6 @@ func (a *App) InvalidateCacheForUserSkipClusterSend(userId string) {
}
func (a *App) InvalidateCacheForUserTeamsSkipClusterSend(userId string) {
a.Srv.Store.Team().InvalidateAllTeamIdsForUser(userId)
hub := a.GetHubForUserId(userId)
if hub != nil {
hub.InvalidateUser(userId)
@@ -332,19 +318,6 @@ func (a *App) InvalidateCacheForUserTeamsSkipClusterSend(userId string) {
}
func (a *App) InvalidateCacheForWebhook(webhookId string) {
a.InvalidateCacheForWebhookSkipClusterSend(webhookId)
if a.Cluster != nil {
msg := &model.ClusterMessage{
Event: model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_WEBHOOK,
SendType: model.CLUSTER_SEND_BEST_EFFORT,
Data: webhookId,
}
a.Cluster.SendClusterMessage(msg)
}
}
func (a *App) InvalidateCacheForWebhookSkipClusterSend(webhookId string) {
a.Srv.Store.Webhook().InvalidateWebhookCache(webhookId)
}