Refactor backup creation

Author: aledbf

components/content-service/pkg/archive/tar.go

@@ -118,6 +118,9 @@ func ExtractTarbal(ctx context.Context, src io.Reader, dst string, opts ...TarOp
 	if err != nil {
 		return xerrors.Errorf("tar %s: %s", dst, err.Error()+";"+string(msg))
 	}
+
+	log.WithField("log", string(msg)).Debug("decompressing tar stream log")
+
 	<-finished
 
 	// lets create a sorted list of pathes and chown depth first.

components/ws-daemon/pkg/content/archive.go

@@ -5,23 +5,20 @@
 package content
 
 import (
-	"archive/tar"
 	"context"
 	"io"
 	"os"
 
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/idtools"
+	"github.com/containers/storage/pkg/archive"
+	"github.com/containers/storage/pkg/idtools"
 	"github.com/opentracing/opentracing-go"
 	"golang.org/x/xerrors"
 
+	"github.com/gitpod-io/gitpod/common-go/log"
 	"github.com/gitpod-io/gitpod/common-go/tracing"
 	carchive "github.com/gitpod-io/gitpod/content-service/pkg/archive"
 )
 
-// ConvertWhiteout converts whiteout files from the archive
-type ConvertWhiteout func(*tar.Header, string) (bool, error)
-
 // BuildTarbal creates an OCI compatible tar file dst from the folder src, expecting the overlay whiteout format
 func BuildTarbal(ctx context.Context, src string, dst string, fullWorkspaceBackup bool, opts ...carchive.TarOption) (err error) {
 	var cfg carchive.TarConfig
@@ -39,6 +36,10 @@ func BuildTarbal(ctx context.Context, src string, dst string, fullWorkspaceBacku
 		return xerrors.Errorf("Unable to tar files: %v", err.Error())
 	}
 
+	if fullWorkspaceBackup {
+		log.Warn("Full workspace backup is disabled.")
+	}
+
 	uidMaps := make([]idtools.IDMap, len(cfg.UIDMaps))
 	for i, m := range cfg.UIDMaps {
 		uidMaps[i] = idtools.IDMap{
@@ -56,86 +57,25 @@ func BuildTarbal(ctx context.Context, src string, dst string, fullWorkspaceBacku
 		}
 	}
 
-	var tarout io.ReadCloser
-	if fullWorkspaceBackup {
-		tarout, err = archive.TarWithOptions(src, &archive.TarOptions{
-			UIDMaps:        uidMaps,
-			GIDMaps:        gidMaps,
-			InUserNS:       true,
-			WhiteoutFormat: archive.OverlayWhiteoutFormat,
-		})
-	} else {
-		tarout, err = TarWithOptions(src, &TarOptions{
-			UIDMaps: uidMaps,
-			GIDMaps: gidMaps,
-		})
-	}
-
+	tarReader, err := archive.TarWithOptions(src, &archive.TarOptions{
+		UIDMaps:     uidMaps,
+		GIDMaps:     gidMaps,
+		Compression: archive.Uncompressed,
+	})
 	if err != nil {
-		return xerrors.Errorf("cannot create tar: %w", err)
+		return
 	}
+	defer tarReader.Close()
 
-	fout, err := os.OpenFile(dst, os.O_WRONLY|os.O_CREATE, 0744)
+	tarFile, err := os.OpenFile(dst, os.O_CREATE|os.O_WRONLY, 0755)
 	if err != nil {
-		return cleanCorruptedTarballAndReturnError(dst, xerrors.Errorf("cannot open archive for writing: %w", err))
+		return xerrors.Errorf("Unable to create tar file: %v", err.Error())
 	}
 
-	defer fout.Close()
-
-	_, err = io.Copy(fout, tarout)
+	_, err = io.Copy(tarFile, tarReader)
 	if err != nil {
-		return cleanCorruptedTarballAndReturnError(dst, xerrors.Errorf("cannot write tar file: %w", err))
-	}
-	if err = fout.Sync(); err != nil {
-		return cleanCorruptedTarballAndReturnError(dst, xerrors.Errorf("cannot flush tar out stream: %w", err))
+		return xerrors.Errorf("Unable create tar file: %v", err.Error())
 	}
 
-	return nil
-}
-
-// ErrMaxSizeExceeded is emitted by LimitWriter when a write tries to write beyond the max number of bytes allowed
-var ErrMaxSizeExceeded = xerrors.Errorf("maximum size exceeded")
-
-// cleanCorruptedTarballAndReturnError cleans up the file located at path dst and returns the error err passed to it
-func cleanCorruptedTarballAndReturnError(dst string, err error) error {
-	os.Remove(dst)
-	return err
-}
-
-// newLimitWriter wraps a writer such that a maximum of N bytes can be written. Once that limit is exceeded
-// the writer returns io.ErrClosedPipe
-func newLimitWriter(out io.Writer, maxSizeBytes int64) *limitWriter {
-	return &limitWriter{
-		MaxSizeBytes: maxSizeBytes,
-		Out:          out,
-	}
-}
-
-type limitWriter struct {
-	MaxSizeBytes int64
-	Out          io.Writer
-	BytesWritten int64
-
-	didMaxOut bool
-}
-
-func (s *limitWriter) Write(b []byte) (n int, err error) {
-	if s.MaxSizeBytes == 0 {
-		return s.Out.Write(b)
-	}
-
-	bsize := int64(len(b))
-	if bsize+s.BytesWritten > s.MaxSizeBytes {
-		s.didMaxOut = true
-		return 0, ErrMaxSizeExceeded
-	}
-
-	n, err = s.Out.Write(b)
-	s.BytesWritten += int64(n)
-
-	return n, err
-}
-
-func (s *limitWriter) DidMaxOut() bool {
-	return s.didMaxOut
+	return
 }