From af33b21ee7f60d28f7ed54f940a92b29f81402a2 Mon Sep 17 00:00:00 2001 From: Antoni Reus Date: Fri, 22 Nov 2024 08:43:28 +0100 Subject: [PATCH 1/2] Exasupport now requires explicit `-d 0` --- .../com/exasol/support/SupportInformationRetriever.java | 4 ++-- .../com/exasol/support/SupportInformationRetrieverIT.java | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/exasol/support/SupportInformationRetriever.java b/src/main/java/com/exasol/support/SupportInformationRetriever.java index 0287c040..3fc4102a 100644 --- a/src/main/java/com/exasol/support/SupportInformationRetriever.java +++ b/src/main/java/com/exasol/support/SupportInformationRetriever.java @@ -26,7 +26,7 @@ public class SupportInformationRetriever { /** Name of the property that allows overriding the monitored container exit */ public static final String MONITORED_EXIT_PROPERTY = "com.exasol.containers.monitored_exit"; static final String SUPPORT_ARCHIVE_PREFIX = "exacluster_debuginfo_"; - private static final String EXASUPPORT_EXECUTABLE = "exasupport"; + private static final String[] EXASUPPORT_COMMAND = {"exasupport", "-d", "0"}; private static final Logger LOGGER = LoggerFactory.getLogger(SupportInformationRetriever.class); private static final String MAPPED_HOST_DIRECTORY = "/exa/tmp/support"; private static final ExitType DEFAULT_MONITORED_EXIT_TYPE = ExitType.EXIT_NONE; @@ -95,7 +95,7 @@ public void run(final ExitType exitType) { @SuppressWarnings("java:S112") private void createArchiveBundle(final ExitType exitType) { try { - final ExecResult result = this.container.execInContainer(EXASUPPORT_EXECUTABLE); + final ExecResult result = this.container.execInContainer(EXASUPPORT_COMMAND); if (result.getExitCode() == ExitCode.OK) { final String filename = extractFilenameFromConsoleMessage(result); final String hostPath = getHostPath(filename); diff --git a/src/test/java/com/exasol/support/SupportInformationRetrieverIT.java b/src/test/java/com/exasol/support/SupportInformationRetrieverIT.java index 1702c099..6dd2d001 100644 --- a/src/test/java/com/exasol/support/SupportInformationRetrieverIT.java +++ b/src/test/java/com/exasol/support/SupportInformationRetrieverIT.java @@ -32,13 +32,6 @@ class SupportInformationRetrieverIT { private static final Logger LOGGER = LoggerFactory.getLogger(SupportInformationRetrieverIT.class); private static final String SYSINFO_FILENAME = "sysinfo.txt"; - @BeforeAll - static void assumeSupportPackageSupported() { - // These tests don't work with Exasol v8. We will fix this in - // https://github.com/exasol/exasol-testcontainers/issues/254 - ExasolContainerAssumptions.assumeDockerDbVersionNotOverriddenToBelowExasolEight(); - } - // [itest->dsn~configure-support-information-retriever-via-api~1] @Test void testWriteSupportBundleOnExit(@TempDir final Path tempDir) { From 9828e16ac4073e73e54ddae8f195f453ecf0a8de Mon Sep 17 00:00:00 2001 From: Antoni Reus Date: Fri, 22 Nov 2024 09:07:39 +0100 Subject: [PATCH 2/2] adapt changelog --- doc/changes/changes_7.1.2.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/changes/changes_7.1.2.md b/doc/changes/changes_7.1.2.md index bad94d7c..6c2d9488 100644 --- a/doc/changes/changes_7.1.2.md +++ b/doc/changes/changes_7.1.2.md @@ -1,4 +1,4 @@ -# Test Containers for Exasol on Docker 7.1.2, released 2024-??-?? +# Test Containers for Exasol on Docker 7.1.2, released 2024-10-22 Code name: Allow withExposedPorts @@ -8,11 +8,14 @@ This release fixes an issue that prevented the container startup when using the The installation of ScriptLanguageContainers requires the BucketFS internal port to be available, but this shouldn't be the case when no SLC has been requested to be installed. -It also bumps default docker image to 7.1.30. +It also adapts the support of information retrieval at exit to work with Exasol v8. + +The default docker image was bumped to 7.1.30. ## Bugfix * #257: Container startup fails when using withExposedPorts() +* #254: Adapt SupportInformationRetriever for Exasol v8 ## Dependency Updates