From 62f6e969e78b76fa434ccdc194d939f461e3b40d Mon Sep 17 00:00:00 2001 From: Vadim Kharitonov Date: Wed, 14 Dec 2022 16:33:51 +0100 Subject: [PATCH 1/2] Fix helm value for proxy --- .github/helm-values/neon-stress.proxy-scram.yaml | 4 +--- .github/helm-values/production.proxy-scram.yaml | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/helm-values/neon-stress.proxy-scram.yaml b/.github/helm-values/neon-stress.proxy-scram.yaml index bbdd13781c..dea47304a0 100644 --- a/.github/helm-values/neon-stress.proxy-scram.yaml +++ b/.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" diff --git a/.github/helm-values/production.proxy-scram.yaml b/.github/helm-values/production.proxy-scram.yaml index 7011a9ce01..399bc6d21b 100644 --- a/.github/helm-values/production.proxy-scram.yaml +++ b/.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" From df09d0375b153d68ccdef538327ce34c9894ce89 Mon Sep 17 00:00:00 2001 From: Dmitry Rodionov Date: Wed, 14 Dec 2022 17:24:53 +0200 Subject: [PATCH 2/2] ignore metadata_backup files in index_part --- pageserver/src/storage_sync2/index.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pageserver/src/storage_sync2/index.rs b/pageserver/src/storage_sync2/index.rs index ce9a43ed3b..82487339ee 100644 --- a/pageserver/src/storage_sync2/index.rs +++ b/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))