diff --git a/pageserver/src/layered_repository/filename.rs b/pageserver/src/layered_repository/filename.rs index f088088277..5ebac2332d 100644 --- a/pageserver/src/layered_repository/filename.rs +++ b/pageserver/src/layered_repository/filename.rs @@ -10,7 +10,7 @@ use std::path::PathBuf; use utils::lsn::Lsn; -// Note: LayeredTimeline::load_layer_map() relies on this sort order +// Note: Timeline::load_layer_map() relies on this sort order #[derive(Debug, PartialEq, Eq, Clone)] pub struct DeltaFileName { pub key_range: Range, diff --git a/pageserver/src/layered_repository/metadata.rs b/pageserver/src/layered_repository/metadata.rs index 74679cb43a..f3ddd42e76 100644 --- a/pageserver/src/layered_repository/metadata.rs +++ b/pageserver/src/layered_repository/metadata.rs @@ -1,4 +1,4 @@ -//! Every image of a certain timeline from [`crate::layered_repository::LayeredRepository`] +//! Every image of a certain timeline from [`crate::layered_repository::Repository`] //! has a metadata that needs to be stored persistently. //! //! Later, the file gets is used in [`crate::remote_storage::storage_sync`] as a part of @@ -30,7 +30,7 @@ pub const METADATA_FILE_NAME: &str = "metadata"; /// Metadata stored on disk for each timeline /// -/// The fields correspond to the values we hold in memory, in LayeredTimeline. +/// The fields correspond to the values we hold in memory, in Timeline. #[derive(Debug, Clone, PartialEq, Eq)] pub struct TimelineMetadata { hdr: TimelineMetadataHeader, diff --git a/pageserver/src/layered_repository/timeline.rs b/pageserver/src/layered_repository/timeline.rs index a909dcb5a1..ecf9a87500 100644 --- a/pageserver/src/layered_repository/timeline.rs +++ b/pageserver/src/layered_repository/timeline.rs @@ -366,7 +366,7 @@ pub struct Timeline { /// Layer removal lock. /// A lock to ensure that no layer of the timeline is removed concurrently by other threads. /// This lock is acquired in [`Timeline::gc`], [`Timeline::compact`], - /// and [`LayeredRepository::delete_timeline`]. + /// and [`Repository::delete_timeline`]. layer_removal_cs: Mutex<()>, // Needed to ensure that we can't create a branch at a point that was already garbage collected diff --git a/pageserver/src/walreceiver/walreceiver_connection.rs b/pageserver/src/walreceiver/walreceiver_connection.rs index b5f266614e..f816198eda 100644 --- a/pageserver/src/walreceiver/walreceiver_connection.rs +++ b/pageserver/src/walreceiver/walreceiver_connection.rs @@ -63,7 +63,7 @@ pub async fn handle_walreceiver_connection( ) .await .context("Timed out while waiting for walreceiver connection to open")? - .context("Failed to open walreceiver conection")?; + .context("Failed to open walreceiver connection")?; info!("connected!"); let mut connection_status = WalConnectionStatus { diff --git a/test_runner/batch_others/test_remote_storage.py b/test_runner/batch_others/test_remote_storage.py index 1e4fdc8602..0015c75670 100644 --- a/test_runner/batch_others/test_remote_storage.py +++ b/test_runner/batch_others/test_remote_storage.py @@ -38,17 +38,17 @@ from fixtures.utils import lsn_from_hex, query_scalar # * queries the specific data, ensuring that it matches the one stored before # # The tests are done for all types of remote storage pageserver supports. -@pytest.mark.parametrize("remote_storatge_kind", available_remote_storages()) +@pytest.mark.parametrize("remote_storage_kind", available_remote_storages()) def test_remote_storage_backup_and_restore( neon_env_builder: NeonEnvBuilder, - remote_storatge_kind: RemoteStorageKind, + remote_storage_kind: RemoteStorageKind, ): # Use this test to check more realistic SK ids: some etcd key parsing bugs were related, # and this test needs SK to write data to pageserver, so it will be visible neon_env_builder.safekeepers_id_start = 12 neon_env_builder.enable_remote_storage( - remote_storage_kind=remote_storatge_kind, + remote_storage_kind=remote_storage_kind, test_name="test_remote_storage_backup_and_restore", ) diff --git a/test_runner/batch_others/test_tenants_with_remote_storage.py b/test_runner/batch_others/test_tenants_with_remote_storage.py index 7db58c2a70..083150e12a 100644 --- a/test_runner/batch_others/test_tenants_with_remote_storage.py +++ b/test_runner/batch_others/test_tenants_with_remote_storage.py @@ -53,10 +53,10 @@ async def all_tenants_workload(env: NeonEnv, tenants_pgs): await asyncio.gather(*workers) -@pytest.mark.parametrize("remote_storatge_kind", available_remote_storages()) -def test_tenants_many(neon_env_builder: NeonEnvBuilder, remote_storatge_kind: RemoteStorageKind): +@pytest.mark.parametrize("remote_storage_kind", available_remote_storages()) +def test_tenants_many(neon_env_builder: NeonEnvBuilder, remote_storage_kind: RemoteStorageKind): neon_env_builder.enable_remote_storage( - remote_storage_kind=remote_storatge_kind, + remote_storage_kind=remote_storage_kind, test_name="test_tenants_many", ) diff --git a/test_runner/batch_others/test_wal_acceptor.py b/test_runner/batch_others/test_wal_acceptor.py index 47838ddb76..28daeb18ed 100644 --- a/test_runner/batch_others/test_wal_acceptor.py +++ b/test_runner/batch_others/test_wal_acceptor.py @@ -420,12 +420,12 @@ def wait_wal_trim(tenant_id, timeline_id, sk, target_size): time.sleep(0.5) -@pytest.mark.parametrize("remote_storatge_kind", available_remote_storages()) -def test_wal_backup(neon_env_builder: NeonEnvBuilder, remote_storatge_kind: RemoteStorageKind): +@pytest.mark.parametrize("remote_storage_kind", available_remote_storages()) +def test_wal_backup(neon_env_builder: NeonEnvBuilder, remote_storage_kind: RemoteStorageKind): neon_env_builder.num_safekeepers = 3 neon_env_builder.enable_remote_storage( - remote_storage_kind=remote_storatge_kind, + remote_storage_kind=remote_storage_kind, test_name="test_safekeepers_wal_backup", ) @@ -468,12 +468,12 @@ def test_wal_backup(neon_env_builder: NeonEnvBuilder, remote_storatge_kind: Remo wait_segment_offload(tenant_id, timeline_id, env.safekeepers[1], "0/5000000") -@pytest.mark.parametrize("remote_storatge_kind", available_remote_storages()) -def test_s3_wal_replay(neon_env_builder: NeonEnvBuilder, remote_storatge_kind: RemoteStorageKind): +@pytest.mark.parametrize("remote_storage_kind", available_remote_storages()) +def test_s3_wal_replay(neon_env_builder: NeonEnvBuilder, remote_storage_kind: RemoteStorageKind): neon_env_builder.num_safekeepers = 3 neon_env_builder.enable_remote_storage( - remote_storage_kind=remote_storatge_kind, + remote_storage_kind=remote_storage_kind, test_name="test_s3_wal_replay", )