Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix graceful terminate in filestore. #1120

Merged
merged 5 commits into from
May 2, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions pkg/filestore/filestore.go
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@ package filestore
import (
"context"
"encoding/json"
"errors"
"fmt"
"io"
"os"
@@ -172,12 +173,19 @@ func (upload *fileUpload) GetReader(ctx context.Context) (io.ReadCloser, error)
}

func (upload *fileUpload) Terminate(ctx context.Context) error {
if err := os.Remove(upload.infoPath); err != nil {
// We ignore errors indicating that the files cannot be found because we want
// to delete them anyways. The files might be removed by a cron job for cleaning up
// or some file might have been removed when tusd crashed during the termination.
err := os.Remove(upload.binPath)
if !errors.Is(err, os.ErrNotExist) {
return err
}
if err := os.Remove(upload.binPath); err != nil {

err = os.Remove(upload.infoPath)
if !errors.Is(err, os.ErrNotExist) {
return err
}

return nil
}