Gzip files

Signed-off-by: JoshVanL <[email protected]>

Author: JoshVanL

pkg/tarmak/snapshot/consul/consul.go

@@ -66,7 +66,7 @@ func (c *Consul) Save() error {
 	cmdArgs := append(envCmd,
 		strings.Split(fmt.Sprintf(consulCmd, "save", hostPath), " ")...)
 	cmdArgs = append(cmdArgs,
-		strings.Split(fmt.Sprintf(snapshot.TarCCmd, hostPath), " ")...)
+		strings.Split(fmt.Sprintf(snapshot.GZipCCmd, hostPath), " ")...)
 
 	err = c.sshCmd(
 		aliases[0],
@@ -96,11 +96,10 @@ func (c *Consul) Restore() error {
 		hostPath := fmt.Sprintf("/tmp/consul-snapshot-%s.snap",
 			time.Now().Format(snapshot.TimeLayout))
 
-		cmdArgs := strings.Split(fmt.Sprintf(snapshot.TarXCmd, hostPath), " ")
-		//cmdArgs := strings.Split(snapshot.TarXCmd, " ")
-		//cmdArgs = append(cmdArgs,
-		//	append(envCmd,
-		//		strings.Split(fmt.Sprintf(consulCmd, "restore", hostPath), " ")...)...)
+		cmdArgs := strings.Split(fmt.Sprintf(snapshot.GZipDCmd, hostPath, hostPath), " ")
+		cmdArgs = append(cmdArgs,
+			append(envCmd,
+				strings.Split(fmt.Sprintf(consulCmd, "restore", hostPath), " ")...)...)
 
 		var result *multierror.Error
 		var errLock sync.Mutex

pkg/tarmak/snapshot/etcd/etcd.go

@@ -85,7 +85,7 @@ func (e *Etcd) Save() error {
 		cmdArgs := append(e.template(envCmd, store),
 			strings.Split(fmt.Sprintf(etcdctlCmd, "save", hostPath), " ")...)
 		cmdArgs = append(cmdArgs,
-			strings.Split(fmt.Sprintf(snapshot.TarCCmd, hostPath), " ")...)
+			strings.Split(fmt.Sprintf(snapshot.GZipCCmd, hostPath), " ")...)
 
 		err = e.sshCmd(
 			aliases[0],

pkg/tarmak/snapshot/snapshot.go

@@ -16,9 +16,8 @@ import (
 
 const (
 	TimeLayout = "2006-01-02_15-04-05"
-	TarCCmd    = "tar -czPf - %s"
-	//TarXCmd    = "cat | tar -xz | cat > /tmp/foo" //| cat > %s"
-	TarXCmd = "cat > %s"
+	GZipCCmd   = "gzip -c %s;"
+	GZipDCmd   = "cat > %s.gz; gzip -d %s.gz;"
 )
 
 func Prepare(tarmak interfaces.Tarmak, role string) (aliases []string, err error) {
@@ -79,6 +78,7 @@ func ReadTarFromStream(dest string, stream io.Reader, result *multierror.Error,
 
 		return
 	}
+	defer f.Close()
 
 	if _, err := io.Copy(f, gzr); err != nil {
 
@@ -91,8 +91,7 @@ func ReadTarFromStream(dest string, stream io.Reader, result *multierror.Error,
 }
 
 func WriteTarToStream(src string, stream io.WriteCloser, result *multierror.Error, errLock sync.Mutex) {
-	//defer stream.Close()
-
+	defer stream.Close()
 	f, err := os.Open(src)
 	if err != nil {
 
@@ -102,8 +101,11 @@ func WriteTarToStream(src string, stream io.WriteCloser, result *multierror.Erro
 
 		return
 	}
+	defer f.Close()
 
 	gzw := gzip.NewWriter(stream)
+	defer gzw.Close()
+
 	if _, err := io.Copy(gzw, f); err != nil {
 
 		errLock.Lock()