Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug/#254 fix support information retriever v8 #261

Merged
merged 2 commits into from
Nov 22, 2024
Merged

Bug/#254 fix support information retriever v8 #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af33b21
Exasupport now requires explicit `-d 0`
YotillaAntoni Nov 22, 2024
9828e16
adapt changelog
YotillaAntoni Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions doc/changes/changes_7.1.2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/exasol/support/SupportInformationRetriever.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
7 changes: 0 additions & 7 deletions src/test/java/com/exasol/support/SupportInformationRetrieverIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down