8213561: ZipFile/MultiThreadedReadTest.java timed out in tier1
Reviewed-by: lancea
--- a/test/jdk/java/util/zip/ZipFile/MultiThreadedReadTest.java Thu Jun 20 03:32:14 2019 +0000
+++ b/test/jdk/java/util/zip/ZipFile/MultiThreadedReadTest.java Thu Jun 20 08:02:41 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,14 +28,14 @@
* @build jdk.test.lib.Platform
* jdk.test.lib.util.FileUtils
* @run main MultiThreadedReadTest
- * @key randomness
*/
+import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.nio.file.Paths;
-import java.util.Random;
+import java.util.zip.CRC32;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import java.util.zip.ZipOutputStream;
@@ -44,7 +44,8 @@
public class MultiThreadedReadTest extends Thread {
private static final int NUM_THREADS = 10;
- private static final String ZIPFILE_NAME = "large.zip";
+ private static final String ZIPFILE_NAME =
+ System.currentTimeMillis() + "-bug8038491-tmp.large.zip";
private static final String ZIPENTRY_NAME = "random.txt";
private static InputStream is = null;
@@ -63,23 +64,30 @@
threadArray[i].join();
}
} finally {
+ long t = System.currentTimeMillis();
FileUtils.deleteFileIfExistsWithRetry(Paths.get(ZIPFILE_NAME));
+ System.out.println("Deleting zip file took:" +
+ (System.currentTimeMillis() - t) + "ms");
}
}
private static void createZipFile() throws Exception {
- try (ZipOutputStream zos =
- new ZipOutputStream(new FileOutputStream(ZIPFILE_NAME))) {
-
- zos.putNextEntry(new ZipEntry(ZIPENTRY_NAME));
- StringBuilder sb = new StringBuilder();
- Random rnd = new Random();
- for(int i = 0; i < 1000; i++) {
- // append some random string for ZipEntry
- sb.append(Long.toString(rnd.nextLong()));
- }
- byte[] b = sb.toString().getBytes();
- zos.write(b, 0, b.length);
+ CRC32 crc32 = new CRC32();
+ long t = System.currentTimeMillis();
+ File zipFile = new File(ZIPFILE_NAME);
+ try (FileOutputStream fos = new FileOutputStream(zipFile);
+ BufferedOutputStream bos = new BufferedOutputStream(fos);
+ ZipOutputStream zos = new ZipOutputStream(bos)) {
+ ZipEntry e = new ZipEntry(ZIPENTRY_NAME);
+ e.setMethod(ZipEntry.STORED);
+ byte[] toWrite = "BLAH".repeat(10_000).getBytes();
+ e.setTime(t);
+ e.setSize(toWrite.length);
+ crc32.reset();
+ crc32.update(toWrite);
+ e.setCrc(crc32.getValue());
+ zos.putNextEntry(e);
+ zos.write(toWrite);
}
}
@@ -88,6 +96,7 @@
try {
while (is.read() != -1) { }
} catch (Exception e) {
+ System.out.println("read exception:" + e);
// Swallow any Exceptions (which are expected) - we're only interested in the crash
}
}