From 9b74d554b4938980d2fcd664cba80c762ecdb69b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arpad=20M=C3=BCller?= <arpad@neon.tech>
Date: Thu, 6 Jun 2024 23:35:58 +0200
Subject: [PATCH] Remove generation suffix

---
 pageserver/ctl/src/layers.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pageserver/ctl/src/layers.rs b/pageserver/ctl/src/layers.rs
index 89015ce26f..29f12a7172 100644
--- a/pageserver/ctl/src/layers.rs
+++ b/pageserver/ctl/src/layers.rs
@@ -310,7 +310,12 @@ pub(crate) async fn main(cmd: &LayerCmd) -> Result<()> {
                 let Some(file_name) = file_key.object_name() else {
                     continue;
                 };
-                let Ok(LayerName::Image(_layer_file_name)) = LayerName::from_str(file_name) else {
+                let Some(file_without_generation) = file_name.rsplit_once('-') else {
+                    continue;
+                };
+                let Ok(LayerName::Image(_layer_file_name)) =
+                    LayerName::from_str(file_without_generation.0)
+                else {
                     // Skipping because it's either not a layer or a delta layer
                     println!("object {file_name}: not a delta layer");
                     continue;