Merge pull request #3102 from neondatabase/main

Hotfix. See commits for details

.github/helm-values/neon-stress.proxy-scram.yaml

@@ -4,6 +4,7 @@ settings:
   authBackend: "console"
   authEndpoint: "http://neon-stress-console.local/management/api/v2"
   domain: "*.stress.neon.tech"
+  sentryEnvironment: "development"
 
 podLabels:
   zenith_service: proxy-scram
@@ -24,6 +25,3 @@ metrics:
     enabled: true
     selector:
       release: kube-prometheus-stack
-
-settings:
-  sentryEnvironment: "development"

.github/helm-values/production.proxy-scram.yaml

@@ -2,6 +2,7 @@ settings:
   authBackend: "console"
   authEndpoint: "http://console-release.local/management/api/v2"
   domain: "*.cloud.neon.tech"
+  sentryEnvironment: "production"
 
 podLabels:
   zenith_service: proxy-scram
@@ -22,6 +23,3 @@ metrics:
     enabled: true
     selector:
       release: kube-prometheus-stack
-
-settings:
-  sentryEnvironment: "production"

pageserver/src/storage_sync2/index.rs

@@ -135,7 +135,7 @@ impl<'de> serde::de::Visitor<'de> for UncleanLayerFileNameVisitor {
         match maybe_clean {
             Ok(clean) => Ok(UncleanLayerFileName::Clean(clean)),
             Err(e) => {
-                if v.ends_with(".old") {
+                if v.ends_with(".old") || v == "metadata_backup" {
                     Ok(UncleanLayerFileName::BackupFile(v.to_owned()))
                 } else {
                     Err(E::custom(e))