mirror of
https://github.com/hanzoai/team.git
synced 2026-10-30 14:49:35 +00:00
* Index all public channels when a user joins a team * Precompute team members for indexChannelsForTeam * Refactor RequestContextWithMaster to store package This way, we can import it from both the sqlstore and the searchlayer packages. The alternative for this is duplicating the code in those two packages, but that will *not* work: The context package expects custom types for the keys stored in it, so that different packages never clash with each other when trying to register a new key. See the docs for the WithValue function: https://pkg.go.dev/context#WithValue If we try to duplicate the storeContextKey type in both the sqlstore and searchlayer packages, although they *look* the same, they are not, and HasMaster will fail to get the value of the storeContextKey(useMaster) key if it's from the other package. * Use master in call to GetTeamMembersForChannel In GetTeamMembersForChannel, use the DB from the newly passed context, which will be the receiving context everywhere except in the call done from indexChannelsForTeam, to avoid the read after write issue when saving a team member. * Fix GetPublicChannelsForTeam paging We were using the page and perPage arguments as is in the call to GetPublicChannelsForTeam, but that function expects and offset and a limit as understood by SQL. Although perPage and limit are interchangeable, offset is not equal to page, but to page * perPage. * Add a synchronous bulk indexer for Opensearch * Implement Opensearch's SyncBulkIndexChannels * Add a synchronous bulk indexer for Elasticsearch * Implement Elasticsearch's SynkBulkIndexChannels * Test SyncBulkIndexChannels * make mocks * Bulk index channels on indexChannelsForTeam * Handle error from SyncBulkIndexChannels * Fix style * Revert indexChannelWithTeamMembers refactor * Remove defensive code on sync bulk processor * Revert "Add a synchronous bulk indexer for Opensearch" This reverts commit bfe4671d96bffa9ca27ed3c655fc5527b72bbafb. * Revert "Add a synchronous bulk indexer for Elasticsearch" This reverts commit 6643ae3f30c461544d0861aec7dee1f24e507c37. * Refactor bulk indexers with a common interface * Test all the different implementations Assisted by Claude * Remove debug statements * Refactor common code into _stop * Rename getUserIDsFor{,Private}Channel * Wrap error * Make perPage a const * Fix typos * Call GetTeamsForUser only if needed * Differentiate errors for sync/async processors --------- Co-authored-by: Ibrahim Serdar Acikgoz <[email protected]> Co-authored-by: Mattermost Build <[email protected]>
192 lines
3.9 KiB
Go
192 lines
3.9 KiB
Go
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.enterprise for license information.
|
|
|
|
package opensearch
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"encoding/json"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/elastic/go-elasticsearch/v8/typedapi/types"
|
|
"github.com/mattermost/mattermost/server/public/shared/mlog"
|
|
"github.com/mattermost/mattermost/server/v8/enterprise/elasticsearch/common"
|
|
"github.com/opensearch-project/opensearch-go/v4/opensearchapi"
|
|
)
|
|
|
|
type Bulk struct {
|
|
mut sync.Mutex
|
|
buf *bytes.Buffer
|
|
|
|
client *opensearchapi.Client
|
|
bulkSettings common.BulkSettings
|
|
reqTimeout time.Duration
|
|
logger mlog.LoggerIFace
|
|
|
|
quitFlusher chan struct{}
|
|
quitFlusherWg sync.WaitGroup
|
|
|
|
pendingRequests int
|
|
}
|
|
|
|
func NewBulk(bulkSettings common.BulkSettings,
|
|
client *opensearchapi.Client,
|
|
reqTimeout time.Duration,
|
|
logger mlog.LoggerIFace,
|
|
) *Bulk {
|
|
b := &Bulk{
|
|
bulkSettings: bulkSettings,
|
|
reqTimeout: reqTimeout,
|
|
logger: logger,
|
|
client: client,
|
|
quitFlusher: make(chan struct{}),
|
|
buf: &bytes.Buffer{},
|
|
}
|
|
|
|
// Start the timer only if a flush interval was specified
|
|
if bulkSettings.FlushInterval > 0 {
|
|
b.quitFlusherWg.Add(1)
|
|
go b.periodicFlusher()
|
|
}
|
|
|
|
return b
|
|
}
|
|
|
|
// IndexOp is a helper function to add an IndexOperation to the current bulk request.
|
|
// doc argument can be a []byte, json.RawMessage or a struct.
|
|
func (r *Bulk) IndexOp(op *types.IndexOperation, doc any) error {
|
|
r.mut.Lock()
|
|
defer r.mut.Unlock()
|
|
|
|
operation := types.OperationContainer{Index: op}
|
|
header, err := json.Marshal(operation)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
r.buf.Write(header)
|
|
r.buf.Write([]byte("\n"))
|
|
|
|
switch v := doc.(type) {
|
|
case []byte:
|
|
r.buf.Write(v)
|
|
case json.RawMessage:
|
|
r.buf.Write(v)
|
|
default:
|
|
body, err := json.Marshal(doc)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
r.buf.Write(body)
|
|
}
|
|
|
|
r.buf.Write([]byte("\n"))
|
|
|
|
return r.flushIfNecessary()
|
|
}
|
|
|
|
// DeleteOp is a helper function to add a DeleteOperation to the current bulk request.
|
|
func (r *Bulk) DeleteOp(op *types.DeleteOperation) error {
|
|
r.mut.Lock()
|
|
defer r.mut.Unlock()
|
|
|
|
operation := types.OperationContainer{Delete: op}
|
|
header, err := json.Marshal(operation)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
r.buf.Write(header)
|
|
r.buf.Write([]byte("\n"))
|
|
|
|
return r.flushIfNecessary()
|
|
}
|
|
|
|
// flushIfNecessary flushes the pending buffer if needed.
|
|
// It MUST be called with an already acquired mutex.
|
|
func (r *Bulk) flushIfNecessary() error {
|
|
// Check data threshold, only if specified
|
|
if r.bulkSettings.FlushBytes > 0 {
|
|
if r.buf.Len() >= r.bulkSettings.FlushBytes {
|
|
return r._flush()
|
|
}
|
|
}
|
|
|
|
r.pendingRequests++
|
|
|
|
// Check number of requests threshold, only if specified
|
|
if r.bulkSettings.FlushNumReqs > 0 {
|
|
if r.pendingRequests > r.bulkSettings.FlushNumReqs {
|
|
return r._flush()
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (r *Bulk) Stop() error {
|
|
r.mut.Lock()
|
|
defer r.mut.Unlock()
|
|
r.logger.Info("Stopping Bulk processor")
|
|
|
|
if r.pendingRequests > 0 {
|
|
return r._flush()
|
|
}
|
|
|
|
// Cleanup the timer if the flush interval was specified
|
|
if r.bulkSettings.FlushInterval > 0 {
|
|
close(r.quitFlusher)
|
|
r.quitFlusherWg.Wait()
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (r *Bulk) periodicFlusher() {
|
|
defer r.quitFlusherWg.Done()
|
|
|
|
for {
|
|
select {
|
|
case <-time.After(r.bulkSettings.FlushInterval):
|
|
r.mut.Lock()
|
|
if r.pendingRequests > 0 {
|
|
if err := r._flush(); err != nil {
|
|
r.logger.Warn("Error flushing live indexing buffer", mlog.Err(err))
|
|
}
|
|
}
|
|
r.mut.Unlock()
|
|
case <-r.quitFlusher:
|
|
return
|
|
}
|
|
}
|
|
}
|
|
|
|
// _flush MUST be called with an acquired lock.
|
|
func (r *Bulk) _flush() error {
|
|
if r.pendingRequests == 0 {
|
|
return nil
|
|
}
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), r.reqTimeout)
|
|
defer cancel()
|
|
|
|
_, err := r.client.Bulk(ctx, opensearchapi.BulkReq{
|
|
Body: bytes.NewReader(r.buf.Bytes()),
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
r.buf.Reset()
|
|
r.pendingRequests = 0
|
|
|
|
return nil
|
|
}
|
|
|
|
func (r *Bulk) Flush() error {
|
|
r.mut.Lock()
|
|
defer r.mut.Unlock()
|
|
return r._flush()
|
|
}
|