From aeb1cf9c36d3a895828fd8376ea474c5b635c025 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Mon, 5 Sep 2022 11:09:32 +0300 Subject: [PATCH] Fix misc typos and grammar in comments. --- pageserver/src/tenant_mgr.rs | 8 ++++---- test_runner/fixtures/neon_fixtures.py | 4 ++-- test_runner/fixtures/types.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pageserver/src/tenant_mgr.rs b/pageserver/src/tenant_mgr.rs index cbf9f2094a..7c82745142 100644 --- a/pageserver/src/tenant_mgr.rs +++ b/pageserver/src/tenant_mgr.rs @@ -435,10 +435,10 @@ pub fn detach_tenant(conf: &'static PageServerConf, tenant_id: ZTenantId) -> any tenants_state::write_tenants().remove(&tenant_id); // If removal fails there will be no way to successfully retry detach, - // because tenant no longer exists in in memory map. And it needs to be removed from it - // before we remove files because it contains references to repository - // which references ephemeral files which are deleted on drop. So if we keep these references - // code will attempt to remove files which no longer exist. This can be fixed by having shutdown + // because the tenant no longer exists in the in-memory map. And it needs to be removed from it + // before we remove files, because it contains references to repository + // which references ephemeral files which are deleted on drop. So if we keep these references, + // we will attempt to remove files which no longer exist. This can be fixed by having shutdown // mechanism for repository that will clean temporary data to avoid any references to ephemeral files let local_tenant_directory = conf.tenant_path(&tenant_id); std::fs::remove_dir_all(&local_tenant_directory).with_context(|| { diff --git a/test_runner/fixtures/neon_fixtures.py b/test_runner/fixtures/neon_fixtures.py index 9ad9c0cd2f..8ffb2eb829 100644 --- a/test_runner/fixtures/neon_fixtures.py +++ b/test_runner/fixtures/neon_fixtures.py @@ -2522,8 +2522,8 @@ def check_restored_datadir_content(test_output_dir: Path, env: NeonEnv, pg: Post def wait_until(number_of_iterations: int, interval: float, func): """ - Wait until 'func' returns successfully, without exception. Returns the last return value - from the the function. + Wait until 'func' returns successfully, without exception. Returns the + last return value from the function. """ last_exception = None for i in range(number_of_iterations): diff --git a/test_runner/fixtures/types.py b/test_runner/fixtures/types.py index d5cb200080..bdf675a785 100644 --- a/test_runner/fixtures/types.py +++ b/test_runner/fixtures/types.py @@ -50,7 +50,7 @@ class ZId: """ Datatype for a Neon tenant and timeline IDs. Internally it's a 16-byte array, and the string representation is in hex. This corresponds to the ZId / ZTenantId / - ZTimelineIds in in the Rust code. + ZTimelineIds in the Rust code. """ def __init__(self, x: str):