lee/backrest
1
0
Fork 0
mirror of https://github.com/garethgeorge/backrest.git synced 2025-12-13 09:15:39 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: miscellaneous bug fixes

Browse Source 
* Fixes a problem with incorrectly scanning and removing pending events
   from the operation log for new installations
 * Fixes a bug with the operation tree incorrectly applying query
   selectors when filtering events
 * Updates tooltips and comments in PlanView and GettingStartedGuide
This commit is contained in:
garethgeorge
2024-05-18 19:44:46 -07:00
parent 1a053f2748
commit df4be0f7bc
17 changed files with 1139 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
internal/orchestrator/tasks/taskprune.go
View File

@@ -9,6 +9,7 @@ import (
v1 "github.com/garethgeorge/backrest/gen/go/v1"
"github.com/garethgeorge/backrest/internal/hook"
"github.com/garethgeorge/backrest/internal/ioutil"
"github.com/garethgeorge/backrest/internal/oplog"
"github.com/garethgeorge/backrest/internal/oplog/indexutil"
"go.uber.org/zap"
@@ -106,16 +107,18 @@ func (t *PruneTask) Run(ctx context.Context, st ScheduledTask, runner TaskRunner
ctx, cancel := context.WithCancel(ctx)
interval := time.NewTicker(1 * time.Second)
defer interval.Stop()
var buf synchronizedBuffer
var buf bytes.Buffer
bufWriter := ioutil.SynchronizedWriter{W: &buf}
var wg sync.WaitGroup
wg.Add(1)
go func() {
defer wg.Done()
for {
select {
case <-interval.C:
bufWriter.Mu.Lock()
output := buf.String()
bufWriter.Mu.Unlock()
if len(output) > 8*1024 { // only provide live status upto the first 8K of output.
output = output[:len(output)-8*1024]
}
@@ -133,7 +136,7 @@ func (t *PruneTask) Run(ctx context.Context, st ScheduledTask, runner TaskRunner
}
}()
if err := repo.Prune(ctx, &buf); err != nil {
if err := repo.Prune(ctx, &bufWriter); err != nil {
cancel()
runner.ExecuteHooks([]v1.Hook_Condition{
@@ -147,7 +150,6 @@ func (t *PruneTask) Run(ctx context.Context, st ScheduledTask, runner TaskRunner
cancel()
wg.Wait()
// TODO: it would be best to store the output in separate storage for large status data.
output := buf.String()
if len(output) > 8*1024 { // only save the first 4K of output.
output = output[:len(output)-8*1024]
@@ -157,23 +159,3 @@ func (t *PruneTask) Run(ctx context.Context, st ScheduledTask, runner TaskRunner
return nil
}
// synchronizedBuffer is used for collecting prune command's output
type synchronizedBuffer struct {
mu sync.Mutex
buf bytes.Buffer
}
func (w *synchronizedBuffer) Write(p []byte) (n int, err error) {
w.mu.Lock()
defer w.mu.Unlock()
return w.buf.Write(p)
}
func (w *synchronizedBuffer) String() string {
w.mu.Lock()
defer w.mu.Unlock()
return w.buf.String()
}