[MM-60253] Avoid unnecessary cache clearing during LDAP sync (#28300)

Этот коммит содержится в:
Ben Schumacher
2024-10-03 16:26:53 +02:00
коммит произвёл GitHub
родитель da6b40665a
Коммит f3eee28f56
14 изменённых файлов: 360 добавлений и 141 удалений

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

@@ -2840,21 +2840,21 @@ func (s *RetryLayerChannelStore) UpdateMemberNotifyProps(channelID string, userI
}
func (s *RetryLayerChannelStore) UpdateMembersRole(channelID string, userIDs []string) error {
func (s *RetryLayerChannelStore) UpdateMembersRole(channelID string, userIDs []string) ([]*model.ChannelMember, error) {
tries := 0
for {
err := s.ChannelStore.UpdateMembersRole(channelID, userIDs)
result, err := s.ChannelStore.UpdateMembersRole(channelID, userIDs)
if err == nil {
return nil
return result, nil
}
if !isRepeatableError(err) {
return err
return result, err
}
tries++
if tries >= 3 {
err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures")
return err
return result, err
}
timepkg.Sleep(100 * timepkg.Millisecond)
}
@@ -12071,21 +12071,21 @@ func (s *RetryLayerTeamStore) UpdateMember(rctx request.CTX, member *model.TeamM
}
func (s *RetryLayerTeamStore) UpdateMembersRole(teamID string, userIDs []string) error {
func (s *RetryLayerTeamStore) UpdateMembersRole(teamID string, adminIDs []string) ([]*model.TeamMember, error) {
tries := 0
for {
err := s.TeamStore.UpdateMembersRole(teamID, userIDs)
result, err := s.TeamStore.UpdateMembersRole(teamID, adminIDs)
if err == nil {
return nil
return result, nil
}
if !isRepeatableError(err) {
return err
return result, err
}
tries++
if tries >= 3 {
err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures")
return err
return result, err
}
timepkg.Sleep(100 * timepkg.Millisecond)
}