Skip to content

Commit

Permalink
fix(pageserver): write to both v1+v2 for aux tenant import (#8316)
Browse files Browse the repository at this point in the history
close #8202 ref
#6560

For tenant imports, we now write the aux files into both v1+v2 storage,
so that the test case can pick either one for testing. Given the API is
only used for testing, this looks like a safe change.

Signed-off-by: Alex Chi Z <chi@neon.tech>
  • Loading branch information
skyzh authored Jul 8, 2024
1 parent daea26a commit df3dc6e
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion storage_controller/src/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4062,7 +4062,14 @@ impl Service {
placement_policy: Some(PlacementPolicy::Attached(0)), // No secondaries, for convenient debug/hacking

// There is no way to know what the tenant's config was: revert to defaults
config: TenantConfig::default(),
//
// TODO: remove `switch_aux_file_policy` once we finish auxv2 migration
//
// we write to both v1+v2 storage, so that the test case can use either storage format for testing
config: TenantConfig {
switch_aux_file_policy: Some(models::AuxFilePolicy::CrossValidation),
..TenantConfig::default()
},
})
.await?;

Expand Down

1 comment on commit df3dc6e

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

3129 tests run: 3002 passed, 0 failed, 127 skipped (full report)


Flaky tests (1)

Postgres 15

Code coverage* (full report)

  • functions: 32.6% (6936 of 21280 functions)
  • lines: 50.0% (54544 of 109068 lines)

* collected from Rust tests only


The comment gets automatically updated with the latest test results
df3dc6e at 2024-07-08T20:27:54.585Z :recycle:

Please sign in to comment.