You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by sm...@apache.org on 2014/09/04 21:38:45 UTC
[03/50] git commit: SLIDER-371 test teardown warning of deletion
failures ... fix root cause in SliderUtils
SLIDER-371 test teardown warning of deletion failures ... fix root cause in SliderUtils
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/4d5783e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/4d5783e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/4d5783e1
Branch: refs/heads/feature/SLIDER-280_Restart_AM_fun_tests
Commit: 4d5783e12e3f2a43bfe02e15bf789d34341af0f0
Parents: e4d136e
Author: Steve Loughran <st...@apache.org>
Authored: Thu Aug 28 16:45:28 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Thu Aug 28 18:28:46 2014 +0100
----------------------------------------------------------------------
.../apache/slider/common/tools/SliderUtils.java | 55 +++++++++++---------
.../agent/AgentMiniClusterTestBase.groovy | 2 +-
2 files changed, 31 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4d5783e1/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java b/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
index 188b7d9..a864878 100644
--- a/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
+++ b/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
@@ -1460,35 +1460,40 @@ public final class SliderUtils {
String entry)
throws IOException {
InputStream is = null;
- FSDataInputStream appStream = fs.open(appPath);
- ZipArchiveInputStream zis = new ZipArchiveInputStream(appStream);
- ZipArchiveEntry zipEntry;
- boolean done = false;
- while (!done && (zipEntry = zis.getNextZipEntry()) != null) {
- if (entry.equals(zipEntry.getName())) {
- int size = (int) zipEntry.getSize();
- if (size != -1) {
- log.info("Reading {} of size {}", zipEntry.getName(), zipEntry.getSize());
- byte[] content = new byte[size];
- int offset = 0;
- while (offset < size) {
- offset += zis.read(content, offset, size - offset);
- }
- is = new ByteArrayInputStream(content);
- } else {
- log.debug("Size unknown. Reading {}", zipEntry.getName());
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- while (true) {
- int byteRead = zis.read();
- if (byteRead == -1) {
- break;
+ FSDataInputStream appStream = null;
+ try {
+ appStream = fs.open(appPath);
+ ZipArchiveInputStream zis = new ZipArchiveInputStream(appStream);
+ ZipArchiveEntry zipEntry;
+ boolean done = false;
+ while (!done && (zipEntry = zis.getNextZipEntry()) != null) {
+ if (entry.equals(zipEntry.getName())) {
+ int size = (int) zipEntry.getSize();
+ if (size != -1) {
+ log.info("Reading {} of size {}", zipEntry.getName(), zipEntry.getSize());
+ byte[] content = new byte[size];
+ int offset = 0;
+ while (offset < size) {
+ offset += zis.read(content, offset, size - offset);
}
- baos.write(byteRead);
+ is = new ByteArrayInputStream(content);
+ } else {
+ log.debug("Size unknown. Reading {}", zipEntry.getName());
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ while (true) {
+ int byteRead = zis.read();
+ if (byteRead == -1) {
+ break;
+ }
+ baos.write(byteRead);
+ }
+ is = new ByteArrayInputStream(baos.toByteArray());
}
- is = new ByteArrayInputStream(baos.toByteArray());
+ done = true;
}
- done = true;
}
+ } finally {
+ IOUtils.closeStream(appStream);
}
return is;
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4d5783e1/slider-core/src/test/groovy/org/apache/slider/agent/AgentMiniClusterTestBase.groovy
----------------------------------------------------------------------
diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/AgentMiniClusterTestBase.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/AgentMiniClusterTestBase.groovy
index a957481..4566d9d 100644
--- a/slider-core/src/test/groovy/org/apache/slider/agent/AgentMiniClusterTestBase.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/agent/AgentMiniClusterTestBase.groovy
@@ -85,7 +85,7 @@ extends YarnZKMiniClusterTestBase {
try {
FileUtils.deleteDirectory(tempRoot);
} catch (IOException e) {
- log.warn("Failed to delete $tempRoot :$e", e)
+ log.info("Failed to delete $tempRoot :$e", e)
}
}
}