rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-14 00:42:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use non-versioned pg_distrib dir

Browse Source
This commit is contained in:
Anastasia Lubennikova
2022-09-15 17:40:29 +03:00
parent 532ae81c33
commit 39ad16eaa9
5 changed files with 26 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
control_plane/src/local_env.rs
View File

@@ -197,25 +197,18 @@ impl Default for SafekeeperConf {
}
impl LocalEnv {
pub fn pg_distrib_dir_raw(&self) -> PathBuf {
self.pg_distrib_dir.clone()
}
pub fn pg_distrib_dir(&self, pg_version: u32) -> PathBuf {
let mut path = self.pg_distrib_dir.clone();
let path = self.pg_distrib_dir.clone();
if pg_version != DEFAULT_PG_VERSION {
// step up to the parent directory
// We assume that the pg_distrib subdirs
// for different pg versions
// are located in the same directory
// and follow the naming convention: v14, v15, etc.
path.pop();
match pg_version {
14 => return path.join(format!("v{pg_version}")),
15 => return path.join(format!("v{pg_version}")),
_ => panic!("Unsupported postgres version: {}", pg_version),
};
match pg_version {
14 => path.join(format!("v{pg_version}")),
15 => path.join(format!("v{pg_version}")),
_ => panic!("Unsupported postgres version: {}", pg_version),
}
path
}
pub fn pg_bin_dir(&self, pg_version: u32) -> PathBuf {
@@ -319,7 +312,7 @@ impl LocalEnv {
let mut env: LocalEnv = toml::from_str(toml)?;
// Find postgres binaries.
// Follow POSTGRES_DISTRIB_DIR if set, otherwise look in "pg_install/v14".
// Follow POSTGRES_DISTRIB_DIR if set, otherwise look in "pg_install".
// Note that later in the code we assume, that distrib dirs follow the same pattern
// for all postgres versions.
if env.pg_distrib_dir == Path::new("") {
@@ -327,7 +320,7 @@ impl LocalEnv {
env.pg_distrib_dir = postgres_bin.into();
} else {
let cwd = env::current_dir()?;
env.pg_distrib_dir = cwd.join("pg_install/v14")
env.pg_distrib_dir = cwd.join("pg_install")
}
}

2
control_plane/src/storage.rs
View File

@@ -118,7 +118,7 @@ impl PageServerNode {
// FIXME: the paths should be shell-escaped to handle paths with spaces, quotas etc.
let pg_distrib_dir_param = format!(
"pg_distrib_dir='{}'",
self.env.pg_distrib_dir(pg_version).display()
self.env.pg_distrib_dir_raw().display()
);
let authg_type_param = format!("auth_type='{}'", self.env.pageserver.auth_type);

2
docs/settings.md
View File

@@ -155,6 +155,8 @@ for other files and for sockets for incoming connections.
#### pg_distrib_dir
A directory with Postgres installation to use during pageserver activities.
Since pageserver supports several postgres versions, `pg_distrib_dir` contains
a subdirectory for each version with naming convention `v{PG_MAJOR_VERSION}/`.
Inside that dir, a `bin/postgres` binary should be present.
The default distrib dir is `./pg_install/`.

40
pageserver/src/config.rs
View File

@@ -21,7 +21,6 @@ use utils::{
use crate::tenant::TIMELINES_SEGMENT_NAME;
use crate::tenant_config::{TenantConf, TenantConfOpt};
use crate::DEFAULT_PG_VERSION;
/// The name of the metadata file pageserver creates per timeline.
pub const METADATA_FILE_NAME: &str = "metadata";
@@ -210,7 +209,7 @@ impl Default for PageServerConfigBuilder {
workdir: Set(PathBuf::new()),
pg_distrib_dir: Set(env::current_dir()
.expect("cannot access current directory")
.join(format!("pg_install/v{}", DEFAULT_PG_VERSION))),
.join(format!("pg_install",))),
auth_type: Set(AuthType::Trust),
auth_validation_public_key_path: Set(None),
remote_storage_config: Set(None),
@@ -376,24 +375,13 @@ impl PageServerConf {
// Postgres distribution paths
//
pub fn pg_distrib_dir(&self, pg_version: u32) -> PathBuf {
let mut path = self.pg_distrib_dir.clone();
let path = self.pg_distrib_dir.clone();
if pg_version != DEFAULT_PG_VERSION {
// step up to the parent directory
// We assume that the pg_distrib subdirs
// for different pg versions
// are located in the same directory
// and follow the naming convention: v14, v15, etc.
path.pop();
match pg_version {
14 => return path.join(format!("v{pg_version}")),
15 => return path.join(format!("v{pg_version}")),
_ => panic!("Unsupported postgres version: {}", pg_version),
};
match pg_version {
14 => path.join(format!("v{pg_version}")),
15 => path.join(format!("v{pg_version}")),
_ => panic!("Unsupported postgres version: {}", pg_version),
}
path
}
pub fn pg_bin_dir(&self, pg_version: u32) -> PathBuf {
@@ -477,14 +465,6 @@ impl PageServerConf {
);
}
let pg_version = DEFAULT_PG_VERSION;
if !conf.pg_bin_dir(pg_version).join("postgres").exists() {
bail!(
"Can't find postgres binary at {}",
conf.pg_bin_dir(pg_version).display()
);
}
conf.default_tenant_conf = t_conf.merge(TenantConf::default());
Ok(conf)
@@ -654,6 +634,7 @@ mod tests {
use tempfile::{tempdir, TempDir};
use super::*;
use crate::DEFAULT_PG_VERSION;
const ALL_BASE_VALUES_TOML: &str = r#"
# Initial configuration file created by 'pageserver --init'
@@ -892,9 +873,10 @@ broker_endpoints = ['{broker_endpoint}']
let workdir = tempdir_path.join("workdir");
fs::create_dir_all(&workdir)?;
let pg_distrib_dir = tempdir_path.join(format!("pg_distrib/v{DEFAULT_PG_VERSION}"));
fs::create_dir_all(&pg_distrib_dir)?;
let postgres_bin_dir = pg_distrib_dir.join("bin");
let pg_distrib_dir = tempdir_path.join("pg_distrib");
let pg_distrib_dir_versioned = pg_distrib_dir.join(format!("v{DEFAULT_PG_VERSION}"));
fs::create_dir_all(&pg_distrib_dir_versioned)?;
let postgres_bin_dir = pg_distrib_dir_versioned.join("bin");
fs::create_dir_all(&postgres_bin_dir)?;
fs::write(postgres_bin_dir.join("postgres"), "I'm postgres, trust me")?;

2
pageserver/src/http/routes.rs
View File

@@ -174,7 +174,7 @@ async fn timeline_create_handler(mut request: Request<Body>) -> Result<Response<
request_data.new_timeline_id.map(TimelineId::from),
request_data.ancestor_timeline_id.map(TimelineId::from),
request_data.ancestor_start_lsn,
request_data.pg_version
request_data.pg_version.unwrap_or(crate::DEFAULT_PG_VERSION)
).await {
Ok(Some(new_timeline)) => {
// Created. Construct a TimelineInfo for it.