rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2025-12-26 23:59:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: endpoint_storage_addr as String (#12359)

Browse Source 
It's not a SocketAddr as we use k8s DNS
https://github.com/neondatabase/cloud/issues/19011
This commit is contained in:
Mikhail
2025-06-27 12:06:27 +01:00
committed by GitHub
parent abc1efd5a6
commit ebc12a388c
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
compute_tools/src/compute.rs
View File

@@ -20,7 +20,6 @@ use postgres::NoTls;
use postgres::error::SqlState; use postgres::error::SqlState;
use remote_storage::{DownloadError, RemotePath}; use remote_storage::{DownloadError, RemotePath};
use std::collections::{HashMap, HashSet}; use std::collections::{HashMap, HashSet};
use std::net::SocketAddr;
use std::os::unix::fs::{PermissionsExt, symlink}; use std::os::unix::fs::{PermissionsExt, symlink};
use std::path::Path; use std::path::Path;
use std::process::{Command, Stdio}; use std::process::{Command, Stdio};
@@ -218,7 +217,8 @@ pub struct ParsedSpec {
pub pageserver_connstr: String, pub pageserver_connstr: String,
pub safekeeper_connstrings: Vec<String>, pub safekeeper_connstrings: Vec<String>,
pub storage_auth_token: Option<String>, pub storage_auth_token: Option<String>,
pub endpoint_storage_addr: Option<SocketAddr>, /// k8s dns name and port
pub endpoint_storage_addr: Option<String>,
pub endpoint_storage_token: Option<String>, pub endpoint_storage_token: Option<String>,
} }
@@ -313,13 +313,10 @@ impl TryFrom<ComputeSpec> for ParsedSpec {
.or(Err("invalid timeline id"))? .or(Err("invalid timeline id"))?
}; };
let endpoint_storage_addr: Option<SocketAddr> = spec let endpoint_storage_addr: Option<String> = spec
.endpoint_storage_addr .endpoint_storage_addr
.clone() .clone()
.or_else(|| spec.cluster.settings.find("neon.endpoint_storage_addr")) .or_else(|| spec.cluster.settings.find("neon.endpoint_storage_addr"));
.unwrap_or_default()
.parse()
.ok();
let endpoint_storage_token = spec let endpoint_storage_token = spec
.endpoint_storage_token .endpoint_storage_token
.clone() .clone()