[FIX JENKINS-27042] Use TrueZIP to access archive

Jenkins use org.apache.tools.zip to create the archive, we can not use java.util.zip to extrace: http://commons.apache.org/proper/commons-compress/zip.html#Known_Interoperability_Problems. For whatever reason org.apache.tools.zip implemntation is order of magnitude slower than TrueZIP or java.util.zip.
jenkinsci · Feb 25, 2015 · e4cf328 · e4cf328
1 parent f33ad89
commit e4cf328
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -12,6 +12,11 @@
     <name>Compress Artifacts Plugin</name>
     <description>Keeps build artifacts compressed to save disk space on the master.</description>
     <url>https://wiki.jenkins-ci.org/display/JENKINS/Compress+Artifacts+Plugin</url>
+
+    <properties>
+        <truezip.version>7.7.8</truezip.version>
+    </properties>
+
     <licenses>
         <license>
             <name>MIT License</name>
@@ -22,7 +27,7 @@
         <connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
         <developerConnection>scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
         <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
-      <tag>HEAD</tag>
+        <tag>HEAD</tag>
     </scm>
     <developers>
       <developer>
@@ -31,6 +36,18 @@
         <email>ogondza@gmail.com</email>
       </developer>
     </developers>
+    <dependencies>
+        <dependency>
+            <groupId>de.schlichtherle.truezip</groupId>
+            <artifactId>truezip-driver-zip</artifactId>
+            <version>${truezip.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>de.schlichtherle.truezip</groupId>
+            <artifactId>truezip-file</artifactId>
+            <version>${truezip.version}</version>
+        </dependency>
+    </dependencies>
     <repositories>
         <repository>
             <id>repo.jenkins-ci.org</id>

diff --git a/src/main/java/org/jenkinsci/plugins/compress_artifacts/ZipStorage.java b/src/main/java/org/jenkinsci/plugins/compress_artifacts/ZipStorage.java
@@ -30,26 +30,29 @@
 
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
+
+import javax.annotation.Nonnull;
 
 import jenkins.util.VirtualFile;
 
 import org.apache.commons.httpclient.URIException;
 import org.apache.commons.httpclient.util.URIUtil;
 import org.apache.tools.ant.types.selectors.SelectorUtils;
 
+import de.schlichtherle.truezip.file.TArchiveDetector;
+import de.schlichtherle.truezip.file.TFile;
+import de.schlichtherle.truezip.file.TVFS;
+
 final class ZipStorage extends VirtualFile {
 
     static VirtualFile root(File archive) {
@@ -59,14 +62,21 @@ static VirtualFile root(File archive) {
     // TODO support updating entries
     static void archive(File archive, FilePath workspace, Launcher launcher, BuildListener listener, Map<String,String> artifacts) throws IOException, InterruptedException {
         // Use temporary file for writing, rename when done
-        File writingArchive = new File(archive.getAbsolutePath() + ".writing");
-        OutputStream os = new FileOutputStream(writingArchive);
-        try {
-            workspace.zip(os, new FilePath.ExplicitlySpecifiedDirScanner(artifacts));
-        } finally {
-            os.close();
+        File tempArchive = new File(archive.getAbsolutePath() + ".writing.zip");
+
+        TFile zip = new TFile(tempArchive, new TArchiveDetector("zip"));
+        zip.mkdir(); // Create new archive file
+        for (Entry<String, String> afs: artifacts.entrySet()) {
+            FilePath src = workspace.child(afs.getKey());
+            TFile dst = new TFile(zip, afs.getValue(), TArchiveDetector.NULL);
+            if (src.isDirectory()) {
+                dst.mkdirs();
+            } else {
+                TFile.cp(src.read(), dst);
+            }
         }
-        writingArchive.renameTo(archive);
+        TVFS.umount(zip);
+        tempArchive.renameTo(archive);
     }
 
     static boolean delete(File archive) throws IOException, InterruptedException {
@@ -206,7 +216,7 @@ private boolean looksLikeDir() {
             while (entries.hasMoreElements()) {
             	ZipEntry entry = entries.nextElement();
             	if ((! entry.isDirectory()) && entry.getName().startsWith(path)) {
-            		String name = entry.toString().substring(path.length());
+            		String name = entry.getName().substring(path.length());
             		if (SelectorUtils.match(glob, name)) {
             			files.add(name);
             		}
@@ -257,7 +267,7 @@ private boolean looksLikeDir() {
     @Override public boolean canRead() throws IOException {
         return true;
     }
-    
+
     @Override public InputStream open() throws IOException {
         if (!archive.exists()) throw new FileNotFoundException(path + " (No such file or directory)");