From 982b1ea6bd4dd9af0d9242448acd1b8d768de84e Mon Sep 17 00:00:00 2001
From: Alex Chi Z <chi@neon.tech>
Date: Fri, 25 Jul 2025 17:15:03 -0400
Subject: [PATCH] fix

Signed-off-by: Alex Chi Z <chi@neon.tech>
---
 pageserver/src/pgdatadir_mapping.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pageserver/src/pgdatadir_mapping.rs b/pageserver/src/pgdatadir_mapping.rs
index e513f452bd..e749eaaafe 100644
--- a/pageserver/src/pgdatadir_mapping.rs
+++ b/pageserver/src/pgdatadir_mapping.rs
@@ -778,16 +778,16 @@ impl Timeline {
             .await?;
         let mut rels = HashSet::new();
         for (key, val) in results {
+            if key == REL_DIR_MIGRATION_KEY {
+                // The key that determines the current migration status, skip it.
+                continue;
+            }
             let val = RelDirExists::decode(&val?).map_err(|_| {
                 PageReconstructError::Other(anyhow::anyhow!(
                     "invalid reldir key: decode failed, {}",
                     key
                 ))
             })?;
-            if key.field6 == 0 {
-                // The key that determines the current migration status, skip it.
-                continue;
-            }
             if key.field6 != 1 {
                 return Err(PageReconstructError::Other(anyhow::anyhow!(
                     "invalid reldir key: field6 != 1, {}",
@@ -813,11 +813,11 @@ impl Timeline {
                 forknum: key.field5,
             };
             if val == RelDirExists::Removed {
-                debug_assert!(!rels.contains(&tag), "removed reltag in v2");
+                debug_assert!(!rels.contains(&tag), "removed reltag in v2: {tag}");
                 continue;
             }
             let did_not_contain = rels.insert(tag);
-            debug_assert!(did_not_contain, "duplicate reltag in v2");
+            debug_assert!(did_not_contain, "duplicate reltag in v2: {tag}");
         }
         Ok(rels)
     }