Fix deadlock with unclosed pipe of uploaded tarball (#399)

This problem does not affect buffered storages (like AWS) but can stuck unbuffered (like GCP). Also this commit fixes problem of premature timeout in GCP storage during ReadObject(). This commit should help to resolve #266
wal-g · Sep 4, 2019 · a2c52c0 · a2c52c0
1 parent 8930020
commit a2c52c0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -96,3 +96,7 @@
 [[constraint]]
   branch = "master"
   name = "github.com/tinsane/tracelog"
+
+[[constraint]]
+  revision = "94d6f74dd32347e5c486253b623c49d4d7216e17"
+  name = "github.com/tinsane/storages"
diff --git a/internal/storage_tar_ball.go b/internal/storage_tar_ball.go
@@ -85,6 +85,8 @@ func (tarBall *StorageTarBall) startUpload(name string, crypter crypto.Crypter)
 		if err != nil {
 			tracelog.ErrorLogger.Printf("upload: could not upload '%s'\n", path)
 			tracelog.ErrorLogger.Printf("%v\n", err)
+			err = pipeReader.Close()
+			tracelog.ErrorLogger.FatalfOnError("Failed to close pipe: %v", err)
 		}
 	}()