lee/backrest
1
0
Fork 0
mirror of https://github.com/garethgeorge/backrest.git synced 2025-12-07 22:35:36 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

use a channel for dump err

Browse Source
This commit is contained in:
Gareth
2025-09-28 01:03:11 -07:00
parent 1a1afd0b7c
commit fcebc9b693
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
internal/api/downloadhandler.go
View File

@@ -14,7 +14,6 @@ import (
"path/filepath"
"strconv"
"strings"
"sync"
"time"
v1 "github.com/garethgeorge/backrest/gen/go/v1"
@@ -73,14 +72,11 @@ func handleIndexSnapshotDownload(w http.ResponseWriter, r *http.Request, orchest
return
}
var dumpErrMu sync.Mutex
var dumpErr error
dumpErrCh := make(chan error, 1)
piper, pipew := io.Pipe()
go func() {
dumpErrMu.Lock()
dumpErr = repo.Dump(r.Context(), indexOp.OperationIndexSnapshot.Snapshot.GetId(), filePath, pipew)
dumpErrMu.Unlock()
dumpErrCh <- repo.Dump(r.Context(), indexOp.OperationIndexSnapshot.Snapshot.GetId(), filePath, pipew)
pipew.Close()
}()
@@ -92,14 +88,15 @@ func handleIndexSnapshotDownload(w http.ResponseWriter, r *http.Request, orchest
return
}
dumpErrMu.Lock()
if dumpErr != nil {
zap.S().Errorf("error dumping snapshot: %v", dumpErr)
http.Error(w, fmt.Sprintf("error dumping snapshot: %v", dumpErr), http.StatusInternalServerError)
dumpErrMu.Unlock()
return
select {
case dumpErr := <-dumpErrCh:
if dumpErr != nil {
zap.S().Errorf("error dumping snapshot: %v", dumpErr)
http.Error(w, fmt.Sprintf("error dumping snapshot: %v", dumpErr), http.StatusInternalServerError)
return
}
default:
}
dumpErrMu.Unlock()
if IsTarArchive(bytes.NewReader(firstBytesBuffer.Bytes())) {
w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=%v.tar", filePath))