Merge pull request #10 from JuliaLang/kf/zstdmt

Switch compression to zstdmt
JuliaLang · May 1, 2020 · 95a1ef0 · 95a1ef0
2 parents 6d358f2 + e160dbd
commit 95a1ef0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/Project.toml b/Project.toml
@@ -10,6 +10,7 @@ HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 Tar = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
+Zstd_jll = "3161d3a3-bdf6-5164-811a-617609db77b4"
 rr_jll = "e86bdf43-55f7-5ea2-9fd0-e7daa2c0f2b4"
 
 [compat]

diff --git a/S3Vendor_go/main.go b/S3Vendor_go/main.go
@@ -109,7 +109,7 @@ func vendor(req events.APIGatewayProxyRequest) (events.APIGatewayProxyResponse,
 	os.Unsetenv("AWS_SESSION_TOKEN")
 
 	currentTime := time.Now()
-	fname := fmt.Sprintf("reports/%s-%s.tar.gz", currentTime.Format("2006-01-02T15-04-05"), user.GetLogin())
+	fname := fmt.Sprintf("reports/%s-%s.tar.zstd", currentTime.Format("2006-01-02T15-04-05"), user.GetLogin())
 
 	awsSession := session.New()
 	svc := sts.New(awsSession)

diff --git a/src/BugReporting.jl b/src/BugReporting.jl
@@ -1,6 +1,7 @@
 module BugReporting
 
 using rr_jll
+using Zstd_jll
 using HTTP, JSON
 using AWSCore, AWSS3
 using Tar
@@ -28,7 +29,7 @@ end
 
 function rr_pack(trace_directory)
     check_rr_available()
-    
+
     trace_directory = normalize_inner_trace(trace_directory)
     rr() do rr_path
         run(`$rr_path pack $(trace_directory)`)
@@ -153,7 +154,9 @@ function upload_rr_trace(trace_directory)
     aws = AWSCore.aws_config(creds = creds, region="us-east-1")
 
     # Tar it up
-    proc = open(`gzip -`, "r+")
+    proc = zstdmt() do zstdp
+        open(`$zstdp -`, "r+")
+    end
 
     t = @async begin try
         upload = s3_begin_multipart_upload(aws, TRACE_BUCKET, s3creds["UPLOAD_PATH"])