[incubator-pulsar] branch master updated: dumpContainerDirToTargetCompressed should copy files to a containerName named directory (#2189)

[si...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new d57f400  dumpContainerDirToTargetCompressed should copy files to a containerName named directory (#2189)
d57f400 is described below

commit d57f400121e5d0a232092b67ad7b96f734d9d6e7
Author: Sijie Guo <gu...@gmail.com>
AuthorDate: Wed Jul 25 11:31:28 2018 -0700

    dumpContainerDirToTargetCompressed should copy files to a containerName named directory (#2189)
    
    *Motivation*
    
    dumpContainerLogToTarget copies the files to a containerName named directory.
    However dumpContainerDirToTargetCompressed doesn't.
    
    *Changes*
    
    Change `dumpContainerDirToTargetCompressed` to copy the tarball to a containerName named directory.
---
 .../java/org/apache/pulsar/tests/integration/utils/DockerUtils.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/utils/DockerUtils.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/utils/DockerUtils.java
index d3d7ba2..51fb8d8 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/utils/DockerUtils.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/utils/DockerUtils.java
@@ -113,7 +113,7 @@ public class DockerUtils {
         // docker api returns names prefixed with "/", it's part of it's legacy design,
         // this removes it to be consistent with what docker ps shows.
         final String containerName = inspectContainerResponse.getName().replace("/","");
-        File output = new File(getTargetDirectory(containerId),
+        File output = new File(getTargetDirectory(containerName),
                                (path.replace("/", "-") + ".tar.gz").replaceAll("^-", ""));
         try (InputStream dockerStream = dockerClient.copyArchiveFromContainerCmd(containerId, path).exec();
              OutputStream os = new GZIPOutputStream(new FileOutputStream(output))) {