From 812bf976b9eef77318e7ed53ee68320df3e2f1e6 Mon Sep 17 00:00:00 2001
From: Winfried Plappert <Winfried.Plappert@gmail.com>
Date: Tue, 4 Mar 2025 08:39:53 +0000
Subject: [PATCH] filesaver in repository size monitoring mode

If in monitoring mode, an active file gets truncated by breaking out of the reead loop
The incomplete file list gets fixed by truncating it to the last non-null ID

The file_saver_test.go needs updating with the repo parameter.
---
 internal/archiver/file_saver.go      | 23 ++++++++++++++++++++---
 internal/archiver/file_saver_test.go |  4 +++-
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/internal/archiver/file_saver.go b/internal/archiver/file_saver.go
index ca8ec2fbb..681c7eedd 100644
--- a/internal/archiver/file_saver.go
+++ b/internal/archiver/file_saver.go
@@ -29,11 +29,12 @@ type fileSaver struct {
 	CompleteBlob func(bytes uint64)
 
 	NodeFromFileInfo func(snPath, filename string, meta ToNoder, ignoreXattrListError bool) (*restic.Node, error)
+	repo             archiverRepo
 }
 
 // newFileSaver returns a new file saver. A worker pool with fileWorkers is
 // started, it is stopped when ctx is cancelled.
-func newFileSaver(ctx context.Context, wg *errgroup.Group, save saveBlobFn, pol chunker.Pol, fileWorkers, blobWorkers uint) *fileSaver {
+func newFileSaver(ctx context.Context, wg *errgroup.Group, save saveBlobFn, pol chunker.Pol, fileWorkers, blobWorkers uint, repo archiverRepo) *fileSaver {
 	ch := make(chan saveFileJob)
 
 	debug.Log("new file saver with %v file workers and %v blob workers", fileWorkers, blobWorkers)
@@ -47,6 +48,7 @@ func newFileSaver(ctx context.Context, wg *errgroup.Group, save saveBlobFn, pol
 		ch:           ch,
 
 		CompleteBlob: func(uint64) {},
+		repo:         repo,
 	}
 
 	for i := uint(0); i < fileWorkers; i++ {
@@ -126,11 +128,23 @@ func (s *fileSaver) saveFile(ctx context.Context, chnker *chunker.Chunker, snPat
 			if isCompleted {
 				panic("completed twice")
 			}
-			for _, id := range fnr.node.Content {
-				if id.IsNull() {
+
+			fixEnd := false
+			firstIndex := 0
+			for i, id := range fnr.node.Content {
+				if s.repo.MaxCapacityExceeded() && id.IsNull() {
+					fixEnd = true
+					firstIndex = i
+					break
+				} else if id.IsNull() {
 					panic("completed file with null ID")
 				}
 			}
+
+			if fixEnd {
+				fnr.node.Content = fnr.node.Content[:firstIndex]
+				debug.Log("truncating file %q", fnr.snPath)
+			}
 			isCompleted = true
 			finish(fnr)
 		}
@@ -202,6 +216,9 @@ func (s *fileSaver) saveFile(ctx context.Context, chnker *chunker.Chunker, snPat
 		node.Content = append(node.Content, restic.ID{})
 		lock.Unlock()
 
+		if s.repo.MaxCapacityExceeded() {
+			break
+		}
 		s.saveBlob(ctx, restic.DataBlob, buf, target, func(sbr saveBlobResponse) {
 			lock.Lock()
 			if !sbr.known {
diff --git a/internal/archiver/file_saver_test.go b/internal/archiver/file_saver_test.go
index ce862f6fe..2a2db1d18 100644
--- a/internal/archiver/file_saver_test.go
+++ b/internal/archiver/file_saver_test.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/restic/chunker"
 	"github.com/restic/restic/internal/fs"
+	"github.com/restic/restic/internal/repository"
 	"github.com/restic/restic/internal/restic"
 	"github.com/restic/restic/internal/test"
 	"golang.org/x/sync/errgroup"
@@ -48,7 +49,8 @@ func startFileSaver(ctx context.Context, t testing.TB, fsInst fs.FS) (*fileSaver
 		t.Fatal(err)
 	}
 
-	s := newFileSaver(ctx, wg, saveBlob, pol, workers, workers)
+	repo := repository.TestRepository(t)
+	s := newFileSaver(ctx, wg, saveBlob, pol, workers, workers, repo)
 	s.NodeFromFileInfo = func(snPath, filename string, meta ToNoder, ignoreXattrListError bool) (*restic.Node, error) {
 		return meta.ToNode(ignoreXattrListError)
 	}