mirror of
https://github.com/hcengineering/platform.git
synced 2026-08-25 13:52:24 +02:00
+1








98652c6476
* Add bump-changes * Add utility tests * Add utility tests * Bump to new version of esbuild and typescript * v0.7.3 * use platform rig 0.7.10 * upgrade: memory engine optimized; change name to (was recommended by Copilot and Onnikov, TODO: CHANGE CLIENT TOO!!!) Signed-off-by: Leonid Kaganov <lleo@lleo.me> * Fix rate limits bug * Bump versions * Fix lock file * Fix bug in queue cleanup * Add more tests for queue * Add api-test tests * Initial commit * Improve hierarchy + tests Add tests for hierarchy and few performance/memory optimizations. * Add more hierarchy tests * Move from Huly platform repository * Add docker tests setup * Fix test to be executed only once * Add connection tests * Fix package include source files * More tests * Create README.md * Fix pnpm lock * Fix packages publish * Remove broken tests * feat: adjust hulylake client for storage adapter Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Fix export * Fix publish * Fix message update (#114) Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com> * Bump version Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com> * Bump versions Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Fix lang store (#115) Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com> * update hulylake client Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Bump version Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Add hulylake storage adapter Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Bump version Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * fix validation issues Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * fix: do not fail on deseralization error and add logs Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * bump version -> 0.1.14 Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * fix collaboration test Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Update prettier and new update-deps script Prettier + svelte support * fix unstable ydoc tests Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Add tx ordering middleware * Fix ordering tests * Fix Kafka close of admin * Add tests for measurement and understand overhead * Fix not updated lock file * Fix update-deps * Fix update-deps * Use latest platform-rig * Fix deps * Add rush check to CI * Use latest versions * Bump versions * Fix lock file * validate json patch Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * bump version -> 0.1.15 Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * fix merge unit tests Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Script to sync eslint deps * Fix deps * Fix tests * Fix platform-rig detection * Update to latest platform-rig * Update to latest platform rig and core * Bump typescript * Bump typescript * Rollback eslint plugins * Fix lock file * Bump platform-rig * Update to latest platform-rig * update to latest platform-rig * Allow to compile svelte files * Add ui-test component for checking compile * Fix log levels rename compile ui -> compile ui-esbuild * Fix build * Bump esbuild svelte version * Chore: use fixed versions in update-deps Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com> * Chore: commit changes Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com> * Update deps * Add tests for session manager * Fix txOrdering implementation * Bump ordering * Prevent metrics zero values in measure + Fix format svelte files * Revert update-deps script logic * v0.7.19 * update to latest platform-rig * Update deps * Fix pnpm * Session counters * Fix pnpm lock * Add storage client Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Bump versions Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * fix versions Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Bump core * Fix pnpm * Get rid of communication dependency * Add copilot memory file * Use proper name for instructions file * Fix instructions * Use domain instead of test name in gauges * Update instructions file * fix front service upload Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * remove incorrect test Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Move packages to huly.core * Move packages to core, since they are not utils * Add global user profile Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com> * Fix lock file Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com> * Add support for memory limit check * Bump version * Fix pnpm * report more accurate upload progress Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * fic validation issues Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Fix deps Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com> * Move LowLevelStorage to server * Fix linting * Revert "Fix linting" This reverts commit54631d353e. * Revert "Move LowLevelStorage to server" This reverts commitaafb8f6f12. * feature: add regorus engine with permit file Signed-off-by: Leonid Kaganov <lleo@lleo.me> * Fix one second counters for memory usage * Fix kafka test * use fresh core * Version bump * fix: key parameter added Signed-off-by: Leonid Kaganov <lleo@lleo.me> * Fix readme and few author mistakes * Export domain schemas * Bump version * Tests (#117) Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com> * Bump version Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com> * feat: compact compact worker (#4) Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * bump version -> 0.1.16 Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Add TypeIdentifier Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Add change logs Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * rename send -> try_send Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Bump Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Fix pnpm lock Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Add identifier middleware, bump core Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Add subsciption methods to account client Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com> * Fix lock file Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com> * Fix reaction notification (#118) Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com> * Bump version Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com> * Improve find methods schemas to convert to valid types Signed-off-by: Nikolay Marchuk <nikolay.marchuk@hardcoreeng.com> * Add change description Signed-off-by: Nikolay Marchuk <nikolay.marchuk@hardcoreeng.com> * Do not transcode while recording Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Open telemetry support Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * use proper content type in multipart upload Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Bump versions Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * fix build (#26) Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Fix peers (#120) Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com> * Bump version Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com> * Add ActivityCollaborativeChange Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Update pnpm Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Allow to suspend errors on with * Fix pnpm cache * update versions * v0.7.17 for all * v0.7.11 * v0.7.14 * remove arc from worker Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * bump version -> 0.1.17 Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Rank for attributes Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Update pnpm Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Fix one second counters * Fix withContext and allow pass options * Fix formatting * Use updated deps * Bump versions * Update deps * Update deps to platform.core * add support for textColor mark Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * add support for textStyle mark Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Bump versions Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Bump versions again Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Fix Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Rework on second timers * fix merge of large blobs feched from s3 Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * bump version -> 0.1.18 Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * New subscription methods in account-client * Update lock file Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com> * Send error on find for wrong domain * Suspend connect custom errors events in traces * Bump client * Bump core * update deps * Fix lock file * Sorting for TypeIdentifier Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Bump version Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * add workspace usage info Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Bump versions Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> * Improve pg security perfomance Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Fix identifier middleware Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Update TxAccessLevel interface Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com> * Allow guest to update its identities Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com> * Add password login locked platform status Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com> * Fix Uptrace normalizeMarkdown errors Signed-off-by: Artem Savchenko <armisav@gmail.com> * Add change log Signed-off-by: Artem Savchenko <armisav@gmail.com> * Add txMatch to permission Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * update pnpm lock Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Bump Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Fix permission middleware Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Fix enum sorting Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Enable formatting check Signed-off-by: Andrey Sobolev <haiodo@gmail.com> * Enable formatting check * Add change Signed-off-by: Andrey Sobolev <haiodo@gmail.com> * Fix Uptrace NaN error Signed-off-by: Artem Savchenko <armisav@gmail.com> * feature: removed actors, improved performance Signed-off-by: Leonid Kaganov <lleo@lleo.me> * feature: ping from server to clients added Signed-off-by: Leonid Kaganov <lleo@lleo.me> * feature: ping from server to clients added Signed-off-by: Leonid Kaganov <lleo@lleo.me> * Compress kafka messages and fix exception in findAll Signed-off-by: Artem Savchenko <armisav@gmail.com> * Bump versions Signed-off-by: Artem Savchenko <armisav@gmail.com> * Bump versions Signed-off-by: Artem Savchenko <armisav@gmail.com> * Rush change Signed-off-by: Artem Savchenko <armisav@gmail.com> * Fix compression param Signed-off-by: Artem Savchenko <armisav@gmail.com> * Trigger change Signed-off-by: Artem Savchenko <armisav@gmail.com> * Clean up Signed-off-by: Artem Savchenko <armisav@gmail.com> * Trigger change Signed-off-by: Artem Savchenko <armisav@gmail.com> * Bump markdown version Signed-off-by: Artem Savchenko <armisav@gmail.com> * Enable sub projects * Fix wrong double symbol scripts * Include foundation packages * Add support for custom exclude filters Add support for custom exclude filters - by Andrey Sobolev - haiodo@gmail.com Signed-off-by: Andrey Sobolev <haiodo@gmail.com> * Bump Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> * Fix Uptrace filter is not a function error Signed-off-by: Artem Savchenko <armisav@gmail.com> * Sync versions Signed-off-by: Andrey Sobolev <haiodo@gmail.com> --------- Signed-off-by: Leonid Kaganov <lleo@lleo.me> Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com> Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com> Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com> Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com> Signed-off-by: Nikolay Marchuk <nikolay.marchuk@hardcoreeng.com> Signed-off-by: Artem Savchenko <armisav@gmail.com> Signed-off-by: Andrey Sobolev <haiodo@gmail.com> Co-authored-by: Leonid Kaganov <lleo@lleo.me> Co-authored-by: Alexander Onnikov <Alexander.Onnikov@xored.com> Co-authored-by: Alexander Onnikov <Alexander.Onnikov@gmail.com> Co-authored-by: Kristina <kristin.fefelova@gmail.com> Co-authored-by: Alexey Zinoviev <alexey.zinoviev@xored.com> Co-authored-by: Denis Bykhov <bykhov.denis@gmail.com> Co-authored-by: Nikolay Marchuk <nikolay.marchuk@hardcoreeng.com> Co-authored-by: Alexander Onnikov <aonnikov@hardcoreeng.com> Co-authored-by: Artem Savchenko <armisav@gmail.com>
445 lines
10 KiB
Go
445 lines
10 KiB
Go
// Copyright © 2025 Hardcore Engineering Inc.
|
|
//
|
|
// Licensed under the Eclipse Public License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License. You may
|
|
// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
//
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
// Package uploader provides a mechanism for uploading files to a remote storage.
|
|
package uploader
|
|
|
|
import (
|
|
"context"
|
|
"hash/fnv"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
"sync"
|
|
"syscall"
|
|
"time"
|
|
"unsafe"
|
|
|
|
"github.com/hcengineering/stream/internal/pkg/log"
|
|
"github.com/hcengineering/stream/internal/pkg/storage"
|
|
"github.com/pkg/errors"
|
|
"go.opentelemetry.io/otel"
|
|
"go.uber.org/zap"
|
|
"k8s.io/utils/inotify"
|
|
)
|
|
|
|
var tracer = otel.Tracer("uploader")
|
|
|
|
// See at https://man7.org/linux/man-pages/man7/inotify.7.html
|
|
const inotifyCloseWrite uint32 = 0x8 // IN_CLOSE_WRITE
|
|
const inotifyMovedFrom uint32 = 0x40 // IN_MOVED_FROM
|
|
const inotifyMovedTo uint32 = 0x80 // IN_MOVED_TO
|
|
const inotifyDelete uint32 = 0x200 // IN_DELETE
|
|
|
|
// Uploader represents file uploader
|
|
type Uploader interface {
|
|
Start()
|
|
Stop()
|
|
Cancel()
|
|
}
|
|
|
|
type uploaderImpl struct {
|
|
logger *zap.Logger
|
|
options *Options
|
|
storage storage.Storage
|
|
|
|
filesCh chan string
|
|
|
|
sentFiles sync.Map // key: string, value: struct{}
|
|
|
|
shouldDeleteOnStop func(string) bool
|
|
|
|
workersCh []chan func()
|
|
|
|
watcherStopCh chan struct{}
|
|
watcherDoneCh chan struct{}
|
|
|
|
uploadCtx context.Context
|
|
uploadCancel context.CancelFunc
|
|
|
|
workerWaitGroup sync.WaitGroup
|
|
}
|
|
|
|
// New creates a new instance of uploader
|
|
func New(ctx context.Context, s storage.Storage, opts Options) Uploader {
|
|
if s == nil {
|
|
panic("storage should not be nil")
|
|
}
|
|
|
|
var res = &uploaderImpl{
|
|
options: &opts,
|
|
storage: s,
|
|
logger: log.FromContext(ctx).With(zap.String("uploader", opts.Dir)),
|
|
shouldDeleteOnStop: func(s string) bool {
|
|
return strings.HasSuffix(s, "m3u8")
|
|
},
|
|
filesCh: make(chan string, opts.BufferSize),
|
|
watcherStopCh: make(chan struct{}),
|
|
watcherDoneCh: make(chan struct{}),
|
|
}
|
|
|
|
res.workersCh = make([]chan func(), opts.WorkerCount)
|
|
|
|
for i := range opts.WorkerCount {
|
|
res.workersCh[i] = make(chan func(), opts.BufferSize)
|
|
}
|
|
|
|
res.logger.Sugar().Debugf("uploader config is %v", opts)
|
|
|
|
res.uploadCtx, res.uploadCancel = context.WithCancel(ctx)
|
|
|
|
err := os.MkdirAll(opts.Dir, os.ModePerm)
|
|
if err != nil {
|
|
res.logger.Error("can not create upload directory", zap.Error(err), zap.String("dir", opts.Dir))
|
|
}
|
|
|
|
return res
|
|
}
|
|
|
|
func (u *uploaderImpl) Stop() {
|
|
u.logger.Info("stopping upload")
|
|
u.stop(u.uploadCtx, false)
|
|
}
|
|
|
|
func (u *uploaderImpl) Cancel() {
|
|
u.logger.Info("canceling upload")
|
|
u.stop(u.uploadCtx, true)
|
|
}
|
|
|
|
func (u *uploaderImpl) scanFiles(ctx context.Context) {
|
|
_, span := tracer.Start(ctx, "scanFiles")
|
|
defer span.End()
|
|
|
|
logger := u.logger.With(zap.String("dir", u.options.Dir))
|
|
|
|
logger.Info("scan files")
|
|
files, err := os.ReadDir(u.options.Dir)
|
|
if err != nil {
|
|
logger.Error("failed to read files", zap.Error(err))
|
|
return
|
|
}
|
|
|
|
count := 0
|
|
for _, f := range files {
|
|
if f.IsDir() {
|
|
continue
|
|
}
|
|
|
|
var filePath = filepath.Join(u.options.Dir, f.Name())
|
|
|
|
// Ignore source file
|
|
if filePath == u.options.SourceFile {
|
|
continue
|
|
}
|
|
|
|
if _, uploaded := u.sentFiles.Load(filePath); uploaded {
|
|
logger.Debug("file already uploaded", zap.String("file", filePath))
|
|
continue
|
|
}
|
|
|
|
u.filesCh <- filePath
|
|
count++
|
|
}
|
|
|
|
logger.Info("scan complete", zap.Int("count", count))
|
|
}
|
|
|
|
func (u *uploaderImpl) stop(ctx context.Context, rollback bool) {
|
|
ctx, span := tracer.Start(ctx, "stop")
|
|
defer span.End()
|
|
|
|
// Stop watching for new files
|
|
close(u.watcherStopCh)
|
|
<-u.watcherDoneCh
|
|
|
|
// Scan remaining files in the directory
|
|
u.scanFiles(ctx)
|
|
|
|
// Close filesCh so no new files added
|
|
close(u.filesCh)
|
|
|
|
// Wait for all workers to finish processing
|
|
u.workerWaitGroup.Wait()
|
|
u.logger.Debug("workers done")
|
|
|
|
// Perform rollback
|
|
if rollback {
|
|
u.uploadRollback(ctx)
|
|
}
|
|
|
|
u.uploadCancel()
|
|
|
|
remainingFiles, err := os.ReadDir(u.options.Dir)
|
|
if err != nil && !os.IsNotExist(err) {
|
|
u.logger.Error("failed to read dir", zap.Error(err))
|
|
}
|
|
// log remaining files
|
|
if len(remainingFiles) > 0 {
|
|
files := make([]string, 0, len(remainingFiles))
|
|
for _, entry := range remainingFiles {
|
|
files = append(files, entry.Name())
|
|
}
|
|
u.logger.Info("remaining files", zap.Int("count", len(files)), zap.Any("files", files))
|
|
}
|
|
|
|
u.sentFiles.Clear()
|
|
|
|
u.logger.Debug("stopped", zap.Bool("rollback", rollback))
|
|
}
|
|
|
|
func (u *uploaderImpl) uploadRollback(ctx context.Context) {
|
|
_, span := tracer.Start(ctx, "uploadRollback")
|
|
defer span.End()
|
|
|
|
u.logger.Debug("starting rollback...")
|
|
|
|
// Create a separate worker pool for rollback
|
|
var rollbackWg sync.WaitGroup
|
|
rollbackCh := make(chan string, u.options.BufferSize)
|
|
|
|
// Start rollback workers
|
|
for range u.options.WorkerCount {
|
|
rollbackWg.Add(1)
|
|
go func() {
|
|
defer rollbackWg.Done()
|
|
for filename := range rollbackCh {
|
|
u.deleteRemoteFile(filename)
|
|
}
|
|
}()
|
|
}
|
|
|
|
// Send files to rollback
|
|
u.sentFiles.Range(func(key, _ any) bool {
|
|
rollbackCh <- key.(string)
|
|
return true
|
|
})
|
|
|
|
// Close channel and wait for rollback to complete
|
|
close(rollbackCh)
|
|
rollbackWg.Wait()
|
|
u.logger.Debug("rollback done")
|
|
}
|
|
|
|
func (u *uploaderImpl) Start() {
|
|
watcherReady := make(chan struct{})
|
|
|
|
u.startWorkers()
|
|
go u.startWatch(watcherReady)
|
|
|
|
<-watcherReady
|
|
|
|
u.scanFiles(u.uploadCtx)
|
|
}
|
|
|
|
func (u *uploaderImpl) startWorkers() {
|
|
go func() {
|
|
var logger = u.logger.With(zap.String("func", "startWorkers"))
|
|
logger.Debug("fanout goroutine started")
|
|
defer logger.Debug("fanout goroutine stopped")
|
|
|
|
h := fnv.New32a()
|
|
for f := range u.filesCh {
|
|
// #nosec
|
|
bytes := unsafe.Slice(unsafe.StringData(f), len(f))
|
|
_, _ = h.Write(bytes)
|
|
id := h.Sum32() % u.options.WorkerCount
|
|
u.workersCh[id] <- func() {
|
|
u.uploadAndDelete(f)
|
|
}
|
|
h.Reset()
|
|
}
|
|
for i := range u.options.WorkerCount {
|
|
close(u.workersCh[i])
|
|
}
|
|
}()
|
|
|
|
for i := range u.options.WorkerCount {
|
|
var logger = u.logger.With(zap.Uint32("worker", i))
|
|
|
|
u.workerWaitGroup.Add(1)
|
|
go func(index uint32) {
|
|
logger.Debug("start")
|
|
defer logger.Debug("finished")
|
|
|
|
defer u.workerWaitGroup.Done()
|
|
for work := range u.workersCh[index] {
|
|
work()
|
|
}
|
|
}(i)
|
|
}
|
|
}
|
|
|
|
func (u *uploaderImpl) deleteRemoteFile(f string) {
|
|
var logger = u.logger.With(zap.String("delete remote", f))
|
|
logger.Debug("deleting remote file")
|
|
|
|
for range u.options.RetryCount {
|
|
var ctx, cancel = context.WithTimeout(u.uploadCtx, u.options.Timeout)
|
|
var err = u.storage.DeleteFile(ctx, f)
|
|
cancel()
|
|
|
|
if err != nil {
|
|
logger.Error("attempt failed", zap.Error(err))
|
|
} else {
|
|
logger.Debug("file deleted in remote storage")
|
|
return
|
|
}
|
|
|
|
time.Sleep(u.options.RetryDelay)
|
|
}
|
|
|
|
logger.Error("can not delete remote file")
|
|
}
|
|
|
|
func (u *uploaderImpl) uploadAndDelete(f string) {
|
|
var logger = u.logger.With(zap.String("upload and delete", f))
|
|
logger.Debug("uploading file")
|
|
|
|
if f == u.options.Dir {
|
|
return
|
|
}
|
|
|
|
// Check if the file has already been uploaded
|
|
_, ok := u.sentFiles.Load(f)
|
|
if ok && !u.shouldDeleteOnStop(f) {
|
|
logger.Debug("file already uploaded")
|
|
return
|
|
}
|
|
|
|
if err := waitFileExists(f); err != nil {
|
|
if os.IsNotExist(err) {
|
|
logger.Debug("file does not exist", zap.Error(err))
|
|
} else {
|
|
logger.Error("failed to stat file", zap.Error(err))
|
|
}
|
|
return
|
|
}
|
|
|
|
for attempt := range u.options.RetryCount {
|
|
logger = logger.With(zap.Int("attempt", attempt))
|
|
var putCtx, putCancel = context.WithTimeout(u.uploadCtx, u.options.Timeout)
|
|
var putOptions = storage.PutOptions{
|
|
NoCache: u.shouldDeleteOnStop(f),
|
|
}
|
|
var err = u.storage.PutFile(putCtx, f, putOptions)
|
|
putCancel()
|
|
|
|
if err != nil {
|
|
logger.Error("attempt failed", zap.Error(err))
|
|
} else {
|
|
// Mark the file as uploaded
|
|
u.sentFiles.Store(f, struct{}{})
|
|
logger.Debug("file uploaded")
|
|
|
|
// Update the file's parent if SourceFile is set
|
|
if u.options.Source != "" {
|
|
var setParentCtx, setParentCancel = context.WithTimeout(u.uploadCtx, u.options.Timeout)
|
|
err = u.storage.SetParent(setParentCtx, f, u.options.Source)
|
|
setParentCancel()
|
|
if err != nil {
|
|
logger.Error("can not set blob parent", zap.Error(err), zap.String("filename", f), zap.String("source", u.options.Source))
|
|
}
|
|
}
|
|
|
|
// Delete the file locally if it should be deleted
|
|
if !u.shouldDeleteOnStop(f) {
|
|
if err := os.Remove(f); err != nil && !errors.Is(err, syscall.ENOENT) {
|
|
logger.Error("failed to remove file locally", zap.Error(err), zap.String("file", f))
|
|
} else {
|
|
logger.Debug("removed file locally")
|
|
}
|
|
}
|
|
|
|
break
|
|
}
|
|
|
|
time.Sleep(u.options.RetryDelay)
|
|
}
|
|
}
|
|
|
|
// startWatch watches for changes in the directory and uploads created files
|
|
func (u *uploaderImpl) startWatch(ready chan<- struct{}) {
|
|
defer close(u.watcherDoneCh)
|
|
|
|
var logger = u.logger.With(zap.String("func", "startWatch"))
|
|
var watcher, err = inotify.NewWatcher()
|
|
|
|
if err != nil {
|
|
logger.Error("can not start file watcher", zap.Error(err))
|
|
close(ready)
|
|
return
|
|
}
|
|
defer func() {
|
|
if err := watcher.Close(); err != nil {
|
|
logger.Error("can not close watcher", zap.Error(err))
|
|
}
|
|
}()
|
|
|
|
if err := watcher.AddWatch(u.options.Dir, inotifyCloseWrite|inotifyMovedTo|inotifyDelete|inotifyMovedFrom); err != nil {
|
|
logger.Error("can not start watching", zap.Error(err))
|
|
close(ready)
|
|
return
|
|
}
|
|
|
|
close(ready)
|
|
logger.Debug("watching for file updates")
|
|
defer logger.Debug("done")
|
|
|
|
for {
|
|
select {
|
|
case <-u.watcherStopCh:
|
|
return
|
|
case event, ok := <-watcher.Event:
|
|
if !ok {
|
|
logger.Error("file channel was closed")
|
|
return
|
|
}
|
|
if event.Name == u.options.Dir ||
|
|
event.Name == u.options.SourceFile ||
|
|
strings.HasSuffix(event.Name, ".tmp") {
|
|
continue
|
|
}
|
|
|
|
if event.Mask&(inotifyDelete|inotifyMovedFrom) != 0 {
|
|
logger.Debug("file deleted or moved away", zap.String("event", event.Name), zap.Uint32("mask", event.Mask))
|
|
continue
|
|
}
|
|
|
|
logger.Debug("received an event", zap.String("event", event.Name), zap.Uint32("mask", event.Mask))
|
|
|
|
u.filesCh <- event.Name
|
|
case err, ok := <-watcher.Error:
|
|
if !ok {
|
|
logger.Error("error channel was closed")
|
|
}
|
|
logger.Error("received an error", zap.Error(err))
|
|
}
|
|
}
|
|
}
|
|
|
|
func waitFileExists(file string) error {
|
|
var err error
|
|
var stat os.FileInfo
|
|
|
|
for range 10 {
|
|
stat, err = os.Stat(file)
|
|
if err == nil && stat.Size() > 0 {
|
|
return nil
|
|
}
|
|
|
|
time.Sleep(50 * time.Millisecond)
|
|
}
|
|
|
|
return err
|
|
}
|