Tackle more fd leaks (#1338)

cs3org · Nov 25, 2020 · 57da0c2 · 57da0c2
1 parent 1e6ca25
commit 57da0c2
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 1 deletion.
diff --git a/changelog/unreleased/fix-more-fd-leaks.md b/changelog/unreleased/fix-more-fd-leaks.md
@@ -0,0 +1,5 @@
+Bugfix: Fix fd leaks
+
+There were some left over open file descriptors on simple.go.
+
+https://github.com/cs3org/reva/pull/1338
diff --git a/pkg/rhttp/datatx/manager/simple/simple.go b/pkg/rhttp/datatx/manager/simple/simple.go
@@ -89,6 +89,7 @@ func (m *manager) Handler(fs storage.FS) (http.Handler, error) {
  }
  return
  }
+ defer rc.Close()
 
  _, err = io.Copy(w, rc)
  if err != nil {

diff --git a/pkg/storage/fs/ocis/recycle.go b/pkg/storage/fs/ocis/recycle.go
@@ -69,6 +69,7 @@ func (fs *ocisfs) ListRecycle(ctx context.Context) (items []*provider.RecycleIte
  }
  return nil, errors.Wrap(err, "tree: error listing "+trashRoot)
  }
+ defer f.Close()
 
  names, err := f.Readdirnames(0)
  if err != nil {

diff --git a/pkg/storage/fs/ocis/tree.go b/pkg/storage/fs/ocis/tree.go
@@ -200,7 +200,6 @@ func (t *Tree) Move(ctx context.Context, oldNode *Node, newNode *Node) (err erro
 
 // ListFolder lists the content of a folder node
 func (t *Tree) ListFolder(ctx context.Context, node *Node) ([]*Node, error) {
-
  dir := t.lu.toInternalPath(node.ID)
  f, err := os.Open(dir)
  if err != nil {
@@ -209,6 +208,7 @@ func (t *Tree) ListFolder(ctx context.Context, node *Node) ([]*Node, error) {
  }
  return nil, errors.Wrap(err, "tree: error listing "+dir)
  }
+ defer f.Close()
 
  names, err := f.Readdirnames(0)
  if err != nil {

diff --git a/pkg/storage/fs/ocis/upload.go b/pkg/storage/fs/ocis/upload.go
@@ -546,6 +546,7 @@ func (upload *fileUpload) ConcatUploads(ctx context.Context, uploads []tusd.Uplo
  if err != nil {
  return err
  }
+ defer src.Close()
 
  if _, err := io.Copy(file, src); err != nil {
  return err