fjy closed pull request #6178: trigger clean dir when unzip fails with
IOException
URL: https://github.com/apache/incubator-druid/pull/6178
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentPullerTest.java
b/extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentPullerTest.java
index 8c0b058866a..97139bc8764 100644
---
a/extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentPullerTest.java
+++
b/extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentPullerTest.java
@@ -90,12 +90,10 @@ public void
testDeleteOutputDirectoryWhenErrorIsRaisedPullingSegmentFiles()
final File outDir = Files.createTempDirectory("druid").toFile();
try {
expect(azureStorage.getBlobInputStream(containerName,
blobPath)).andThrow(
- new StorageException(
+ new URISyntaxException(
"error",
"error",
- 404,
- null,
- null
+ 404
)
);
diff --git
a/java-util/src/main/java/io/druid/java/util/common/CompressionUtils.java
b/java-util/src/main/java/io/druid/java/util/common/CompressionUtils.java
index 2fc4a3704d2..99c6367b095 100644
--- a/java-util/src/main/java/io/druid/java/util/common/CompressionUtils.java
+++ b/java-util/src/main/java/io/druid/java/util/common/CompressionUtils.java
@@ -169,6 +169,9 @@ public static long zip(File directory, OutputStream out)
throws IOException
DEFAULT_RETRY_COUNT
);
}
+ catch (IOException e) {
+ throw e;
+ }
catch (Exception e) {
throw Throwables.propagate(e);
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
