Skip to content

The same-major swap and in-place upgrade tests expect the postgresql.conf shape the managed-conf migration writes #4461

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

Merged
erikdarlingdata merged 2 commits into from
Sep 27, 2026
Merged

The same-major swap and in-place upgrade tests expect the postgresql.conf shape the managed-conf migration writes #4461

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1970d69
The same-major swap and in-place upgrade's postgresql.conf pins expec…
erikdarlingdata Sep 27, 2026
bf74a5e
Check the in-place upgrade test's preload line where #4336 moved it
erikdarlingdata Sep 27, 2026
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
31 changes: 21 additions & 10 deletions Darling/Darling.Tests/DarlingStoreUpgradeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2895,14 +2895,20 @@ quiesced update moved it after the swap committed. Both reports agree on where i
Assert.True(Directory.Exists(
Path.Combine(DarlingStoreUpgrade.PreviousRuntimeRootFor(runtimeRoot), "pgsql")));

/* The managed conf blocks are on the NEW data directory: the upgrade wrote them before
pg_upgrade (shared_preload_libraries has to be live for the extension to restore) and
the normal heal path did not duplicate them. */
/* #4336's Step A migrates the new data directory's conf on this same first start: the v1-v15
blocks it wrote before pg_upgrade (shared_preload_libraries has to be live for the extension
to restore) move into darling-managed.conf, behind the include, leaving no v-marker in
postgresql.conf at all. */
var conf = await File.ReadAllTextAsync(Path.Combine(dataDirectory, "postgresql.conf"), timeout.Token);
Assert.Contains("shared_preload_libraries = 'timescaledb'", conf, StringComparison.Ordinal);
Assert.Equal(1, CountOccurrences(conf, DarlingManagedPostgres.ConfMarker));
Assert.Equal(1, CountOccurrences(conf, DarlingManagedPostgres.ConfMarkerV6));
Assert.Equal(1, CountOccurrences(conf, DarlingManagedPostgres.ConfMarkerV7));
Assert.True(ManagedConfFile.HasManagedInclude(conf),
"expected postgresql.conf to carry the darling-managed.conf include after the upgrade's first start (#4336)");
Assert.Equal(0, CountOccurrences(conf, DarlingManagedPostgres.ConfMarker));
Assert.Equal(0, CountOccurrences(conf, DarlingManagedPostgres.ConfMarkerV6));
Assert.Equal(0, CountOccurrences(conf, DarlingManagedPostgres.ConfMarkerV7));

/* The preload line moved with them: it lives in darling-managed.conf, reached through the include,
and keeps both libraries (the check the same-major swap test already makes). */
await ManagedPreloadAssert.FileLevel_HasOneManagedPreloadLine_WithBothLibraries(dataDirectory, timeout.Token);
}
catch (Exception ex)
{
Expand Down Expand Up @@ -3114,10 +3120,15 @@ so the next start adopts it instead of swapping again. */
DarlingStoreUpgrade.ComputeFileHash(shippedZip),
File.ReadAllText(Path.Combine(runtimeRoot, DarlingStoreUpgrade.RuntimeStampFileName)).Trim());

/* #4336's Step A migrates this data directory's conf on the same-major swap's own first
start: the v1-v15 blocks EnsureConfAppended wrote on the previous release move into
darling-managed.conf, behind the include, leaving no v-marker in postgresql.conf. */
var conf = await File.ReadAllTextAsync(Path.Combine(dataDirectory, "postgresql.conf"), timeout.Token);
Assert.Equal(1, CountOccurrences(conf, DarlingManagedPostgres.ConfMarker));
Assert.Equal(1, CountOccurrences(conf, DarlingManagedPostgres.ConfMarkerV6));
Assert.Equal(1, CountOccurrences(conf, DarlingManagedPostgres.ConfMarkerV7));
Assert.True(ManagedConfFile.HasManagedInclude(conf),
"expected postgresql.conf to carry the darling-managed.conf include after the same-major swap's first start (#4336)");
Assert.Equal(0, CountOccurrences(conf, DarlingManagedPostgres.ConfMarker));
Assert.Equal(0, CountOccurrences(conf, DarlingManagedPostgres.ConfMarkerV6));
Assert.Equal(0, CountOccurrences(conf, DarlingManagedPostgres.ConfMarkerV7));

/* #4336's Step A moved shared_preload_libraries into darling-managed.conf, behind the include
this migrated host now carries; postgresql.conf no longer states it directly. */
Expand Down
Loading