From 3fc3152e6738bf9207ae1a9229f6f90fd163c339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Wed, 13 Dec 2023 10:19:01 +0100 Subject: [PATCH] fix upload purge filter and naming MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- changelog/unreleased/fix-upload-session-purging.md | 4 ++++ services/storage-users/pkg/command/uploads.go | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 changelog/unreleased/fix-upload-session-purging.md diff --git a/changelog/unreleased/fix-upload-session-purging.md b/changelog/unreleased/fix-upload-session-purging.md new file mode 100644 index 0000000000..27200b00b6 --- /dev/null +++ b/changelog/unreleased/fix-upload-session-purging.md @@ -0,0 +1,4 @@ +Bugfix: Do not purge expired upload sessions that are still postprocessing + +https://github.com/owncloud/ocis/pull/7859 +https://github.com/owncloud/ocis/pull/7958 \ No newline at end of file diff --git a/services/storage-users/pkg/command/uploads.go b/services/storage-users/pkg/command/uploads.go index 8217a669c4..7f17637858 100644 --- a/services/storage-users/pkg/command/uploads.go +++ b/services/storage-users/pkg/command/uploads.go @@ -53,8 +53,8 @@ func ListUploads(cfg *config.Config) *cli.Command { fmt.Fprintf(os.Stderr, "'%s' storage does not support listing expired uploads\n", cfg.Driver) os.Exit(1) } - falseValue := false - uploads, err := managingFS.ListUploadSessions(c.Context, storage.UploadSessionFilter{Expired: &falseValue}) + expired := false + uploads, err := managingFS.ListUploadSessions(c.Context, storage.UploadSessionFilter{Expired: &expired}) if err != nil { return err } @@ -98,9 +98,9 @@ func PurgeExpiredUploads(cfg *config.Config) *cli.Command { wg := sync.WaitGroup{} wg.Add(1) - falseValue := false - trueValue := false - uploads, err := managingFS.ListUploadSessions(c.Context, storage.UploadSessionFilter{Expired: &trueValue, Processing: &falseValue}) + processing := false + expired := true + uploads, err := managingFS.ListUploadSessions(c.Context, storage.UploadSessionFilter{Expired: &expired, Processing: &processing}) if err != nil { return err }