Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5FE8B200C36 for ; Fri, 10 Mar 2017 17:57:25 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 5E6B7160B79; Fri, 10 Mar 2017 16:57:25 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 82A34160B67 for ; Fri, 10 Mar 2017 17:57:24 +0100 (CET) Received: (qmail 58283 invoked by uid 500); 10 Mar 2017 16:57:23 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 58274 invoked by uid 99); 10 Mar 2017 16:57:23 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Mar 2017 16:57:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4E177DFF30; Fri, 10 Mar 2017 16:57:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jinmeiliao@apache.org To: commits@geode.apache.org Message-Id: <4572199e3f394f20843246e6857996d3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: geode git commit: GEODE-2576: delete the zip file on locator after it's being streamed to client. Date: Fri, 10 Mar 2017 16:57:23 +0000 (UTC) archived-at: Fri, 10 Mar 2017 16:57:25 -0000 Repository: geode Updated Branches: refs/heads/develop ab1686427 -> 12318c5c4 GEODE-2576: delete the zip file on locator after it's being streamed to client. Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/12318c5c Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/12318c5c Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/12318c5c Branch: refs/heads/develop Commit: 12318c5c433b7a683cb3e2efbfc445a97e598184 Parents: ab16864 Author: Jinmei Liao Authored: Wed Mar 8 16:41:34 2017 -0800 Committer: Jinmei Liao Committed: Fri Mar 10 08:57:06 2017 -0800 ---------------------------------------------------------------------- .../web/controllers/ExportLogController.java | 6 ++++- .../ExportLogsFunctionIntegrationTest.java | 8 ++----- .../commands/ExportLogsOverHttpDUnitTest.java | 5 ++++ .../commands/QueryNamesOverHttpDUnitTest.java | 24 ++++++++------------ 4 files changed, 21 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/12318c5c/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ExportLogController.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ExportLogController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ExportLogController.java index f3a5934..0351573 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ExportLogController.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ExportLogController.java @@ -15,6 +15,7 @@ package org.apache.geode.management.internal.web.controllers; +import org.apache.commons.io.FileUtils; import org.apache.geode.internal.lang.StringUtils; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.ResultBuilder; @@ -91,11 +92,14 @@ public class ExportLogController extends AbstractCommandsController { String filePath = ResultBuilder.fromJson(result).nextLine().trim(); HttpHeaders respHeaders = new HttpHeaders(); + File zipFile = new File(filePath); try { - InputStreamResource isr = new InputStreamResource(new FileInputStream(new File(filePath))); + InputStreamResource isr = new InputStreamResource(new FileInputStream(zipFile)); return new ResponseEntity(isr, respHeaders, HttpStatus.OK); } catch (Exception ex) { throw new RuntimeException("IOError writing file to output stream", ex); + } finally { + FileUtils.deleteQuietly(zipFile); } } } http://git-wip-us.apache.org/repos/asf/geode/blob/12318c5c/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunctionIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunctionIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunctionIntegrationTest.java index 72c39dc..cdc5766 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunctionIntegrationTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunctionIntegrationTest.java @@ -25,7 +25,6 @@ import org.apache.geode.cache.execute.FunctionContext; import org.apache.geode.cache.execute.ResultSender; import org.apache.geode.internal.cache.GemFireCacheImpl; import org.apache.geode.internal.cache.execute.FunctionContextImpl; -import org.apache.geode.test.dunit.rules.Server; import org.apache.geode.test.dunit.rules.ServerStarterRule; import org.apache.geode.test.junit.categories.IntegrationTest; import org.apache.logging.log4j.Level; @@ -41,15 +40,12 @@ import java.io.IOException; public class ExportLogsFunctionIntegrationTest { @Rule - public ServerStarterRule serverStarterRule = new ServerStarterRule(); - - private Server server; + public ServerStarterRule serverStarterRule = new ServerStarterRule().startServer(); private File serverWorkingDir; @Before public void setup() throws Exception { - server = serverStarterRule.startServer(); - serverWorkingDir = server.getWorkingDir(); + serverWorkingDir = serverStarterRule.getWorkingDir(); } @Test http://git-wip-us.apache.org/repos/asf/geode/blob/12318c5c/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsOverHttpDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsOverHttpDUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsOverHttpDUnitTest.java index 8c9442a..cc4ae28 100644 --- a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsOverHttpDUnitTest.java +++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsOverHttpDUnitTest.java @@ -25,6 +25,7 @@ import org.junit.experimental.categories.Category; import org.junit.rules.TemporaryFolder; import java.io.File; +import java.util.Arrays; import java.util.Set; import java.util.stream.Collectors; import java.util.zip.ZipEntry; @@ -58,6 +59,10 @@ public class ExportLogsOverHttpDUnitTest extends ExportStatsDUnitTest { new ZipFile(zipPath).stream().map(ZipEntry::getName).collect(Collectors.toSet()); assertThat(actualZipEntries).isEqualTo(expectedZipEntries); + + // also verify that the zip file on locator is deleted + assertThat(Arrays.stream(locator.getWorkingDir().listFiles()) + .filter(file -> file.getName().endsWith(".zip")).collect(Collectors.toSet())).isEmpty(); } protected String getZipPathFromCommandResult(String message) { http://git-wip-us.apache.org/repos/asf/geode/blob/12318c5c/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/QueryNamesOverHttpDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/QueryNamesOverHttpDUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/QueryNamesOverHttpDUnitTest.java index 4ec9c0d..22ca6e3 100644 --- a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/QueryNamesOverHttpDUnitTest.java +++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/QueryNamesOverHttpDUnitTest.java @@ -29,7 +29,6 @@ import org.apache.geode.management.internal.web.http.HttpMethod; import org.apache.geode.management.internal.web.shell.RestHttpOperationInvoker; import org.apache.geode.test.dunit.rules.LocatorStarterRule; import org.apache.geode.test.junit.categories.IntegrationTest; -import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -48,21 +47,16 @@ public class QueryNamesOverHttpDUnitTest { protected static int jmxPort = ports[0]; protected static int httpPort = ports[1]; - @Rule - public LocatorStarterRule locatorRule = new LocatorStarterRule(); - - @Before - public void before() throws Exception { - Properties locatorProps = new Properties() { - { - setProperty(HTTP_SERVICE_BIND_ADDRESS, "localhost"); - setProperty(HTTP_SERVICE_PORT, httpPort + ""); - setProperty(JMX_MANAGER_PORT, jmxPort + ""); - } - }; - locatorRule.startLocator(locatorProps); - } + protected static Properties locatorProps = new Properties() { + { + setProperty(HTTP_SERVICE_BIND_ADDRESS, "localhost"); + setProperty(HTTP_SERVICE_PORT, httpPort + ""); + setProperty(JMX_MANAGER_PORT, jmxPort + ""); + } + }; + @Rule + public LocatorStarterRule locatorRule = new LocatorStarterRule().startLocator(locatorProps); @Test public void testQueryNameOverHttp() throws Exception {