From 4dbb46953985a5b0a72cc43dfd034b8df9727270 Mon Sep 17 00:00:00 2001 From: Konstantin Knizhnik Date: Wed, 4 Dec 2024 10:19:30 +0200 Subject: [PATCH] Remove AuxFileStore from test_pgstat.py --- pageserver/src/tenant/storage_layer/delta_layer.rs | 2 +- pageserver/src/tenant/storage_layer/image_layer.rs | 2 +- test_runner/regress/test_pgstat.py | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pageserver/src/tenant/storage_layer/delta_layer.rs b/pageserver/src/tenant/storage_layer/delta_layer.rs index a13a77e26b..1f01c94cd4 100644 --- a/pageserver/src/tenant/storage_layer/delta_layer.rs +++ b/pageserver/src/tenant/storage_layer/delta_layer.rs @@ -52,8 +52,8 @@ use camino::{Utf8Path, Utf8PathBuf}; use futures::StreamExt; use itertools::Itertools; use pageserver_api::config::MaxVectoredReadBytes; -use pageserver_api::key::{AUX_FILES_KEY, DBDIR_KEY}; use pageserver_api::key::{Key, KEY_SIZE}; +use pageserver_api::key::{AUX_FILES_KEY, DBDIR_KEY}; use pageserver_api::keyspace::KeySpace; use pageserver_api::models::ImageCompressionAlgorithm; use pageserver_api::shard::TenantShardId; diff --git a/pageserver/src/tenant/storage_layer/image_layer.rs b/pageserver/src/tenant/storage_layer/image_layer.rs index 84b6e68d39..7d270b3d82 100644 --- a/pageserver/src/tenant/storage_layer/image_layer.rs +++ b/pageserver/src/tenant/storage_layer/image_layer.rs @@ -49,8 +49,8 @@ use camino::{Utf8Path, Utf8PathBuf}; use hex; use itertools::Itertools; use pageserver_api::config::MaxVectoredReadBytes; -use pageserver_api::key::{AUX_FILES_KEY, DBDIR_KEY}; use pageserver_api::key::{Key, KEY_SIZE}; +use pageserver_api::key::{AUX_FILES_KEY, DBDIR_KEY}; use pageserver_api::keyspace::KeySpace; use pageserver_api::shard::{ShardIdentity, TenantShardId}; use pageserver_api::value::Value; diff --git a/test_runner/regress/test_pgstat.py b/test_runner/regress/test_pgstat.py index 4f89a9961f..8ba125ed49 100644 --- a/test_runner/regress/test_pgstat.py +++ b/test_runner/regress/test_pgstat.py @@ -1,14 +1,11 @@ import pytest -from fixtures.neon_fixtures import AuxFileStore, NeonEnv +from fixtures.neon_fixtures import NeonEnv from fixtures.pg_version import PgVersion # # Test that pgstat statistic is preserved across sessions # -@pytest.mark.parametrize( - "pageserver_aux_file_policy", [AuxFileStore.V1, AuxFileStore.V2, AuxFileStore.CrossValidation] -) def test_pgstat(neon_simple_env: NeonEnv): env = neon_simple_env if env.pg_version == PgVersion.V14: