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

Merge branch 'extension_server' of github.com:neondatabase/neon into extension_server

Browse Source
This commit is contained in:
Alek Westover
2023-06-28 11:59:48 -04:00
parent ce0da2889e ceebc8e870
commit a6f142c4f6
3 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
compute_tools/src/compute.rs
View File

@@ -679,12 +679,12 @@ LIMIT 100",
let spec = &pspec.spec;
// 1. parse private extension paths from spec
// TODO parse private extension paths from spec instead of tenant_id
let mut private_ext_prefixes = Vec::new();
let private_ext_prefixes = match &spec.private_extensions {
Some(private_extensions) => private_extensions.clone(),
None => Vec::new(),
};
if let Some(tenant_id) = spec.tenant_id {
private_ext_prefixes.push(tenant_id.to_string());
}
info!("private_ext_prefixes: {:?}", &private_ext_prefixes);
// 2. parse shared_preload_libraries from spec
let mut libs_vec = Vec::new();
@@ -739,9 +739,12 @@ LIMIT 100",
let compute_state = self.state.lock().unwrap().clone();
let pspec = compute_state.pspec.as_ref().expect("spec must be set");
// TODO parse private extension paths from spec instead of tenant_id
let tenant_id = pspec.tenant_id.to_string();
let private_ext_prefixes: Vec<String> = vec![tenant_id];
let private_ext_prefixes = match &pspec.spec.private_extensions {
Some(private_extensions) => private_extensions.clone(),
None => Vec::new(),
};
info!("private_ext_prefixes: {:?}", &private_ext_prefixes);
extension_server::download_extension_sql_files(
&filename,
@@ -760,6 +763,16 @@ LIMIT 100",
None => anyhow::bail!("No remote extension storage"),
Some(remote_storage) => {
let available_libraries_lock = self.available_libraries.lock().unwrap().clone();
let compute_state = self.state.lock().unwrap().clone();
let pspec = compute_state.pspec.as_ref().expect("spec must be set");
let private_ext_prefixes = match &pspec.spec.private_extensions {
Some(private_extensions) => private_extensions.clone(),
None => Vec::new(),
};
info!("private_ext_prefixes: {:?}", &private_ext_prefixes);
extension_server::download_library_file(
&filename,
remote_storage,

1
control_plane/src/endpoint.rs
View File

@@ -481,6 +481,7 @@ impl Endpoint {
pageserver_connstring: Some(pageserver_connstring),
safekeeper_connstrings,
storage_auth_token: auth_token.clone(),
private_extensions: Some(vec![self.tenant_id.to_string()]), //DEBUG ONLY
};
let spec_path = self.endpoint_path().join("spec.json");
std::fs::write(spec_path, serde_json::to_string_pretty(&spec)?)?;

2
libs/compute_api/src/spec.rs
View File

@@ -60,6 +60,8 @@ pub struct ComputeSpec {
/// If set, 'storage_auth_token' is used as the password to authenticate to
/// the pageserver and safekeepers.
pub storage_auth_token: Option<String>,
pub private_extensions: Option<Vec<String>>,
}
#[serde_as]