Skip to content

Resolve the ClickHouse config symlink in PMM-T2237 #1180

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

Open
claude wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −5
Open

Resolve the ClickHouse config symlink in PMM-T2237 #1180

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 18 additions & 5 deletions e2e_tests/tests/dockerConfiguration/clickhouseConfig.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,27 @@ for (const configuration of configurations) {
cliHelper.execSilent(configuration.command);
await api.serverApi.waitForReady();

const configName = cliHelper.execSilent(
`docker exec ${configuration.containerName} cat /srv/logs/clickhouse-server.log | grep "config"`,
const startupLog = cliHelper.execSilent(
`docker exec ${configuration.containerName} grep -m1 "Processing configuration file" /srv/logs/clickhouse-server.log`,
);
const loadedConfig = startupLog.stdout.match(/Processing configuration file '([^']+)'/)?.[1] ?? '';

expect(
configName.stdout,
`Config name should be: ${configuration.configName} but actual value is: ${configName.stdout}`,
).toContain(`${configuration.configName}.xml`);
loadedConfig,
`ClickHouse reported no configuration file in /srv/logs/clickhouse-server.log: ${startupLog.stdout}`,
).not.toBe('');

// ClickHouse is started with the fixed /etc/clickhouse-server/config.xml name, a symlink
// PMM points at the config PMM_CLICKHOUSE_CONFIG selects; builds before PMM-15309 pass the
// selected config directly. Resolving the reported path covers both.
const resolvedConfig = cliHelper.execSilent(
`docker exec ${configuration.containerName} readlink -f ${loadedConfig}`,
);

expect(
resolvedConfig.stdout.trim(),
`Config name should be: ${configuration.configName} but actual value is: ${resolvedConfig.stdout}`,
).toBe(`/etc/clickhouse-server/${configuration.configName}.xml`);
},
);
});
Expand Down
Loading