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

remove redundant labels

Browse Source
This commit is contained in:
Anastasia Lubennikova
2024-10-15 14:34:26 +01:00
parent e7d9f9245d
commit 2575be6dec
3 changed files with 4 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
compute_tools/src/compute.rs
View File

@@ -1490,11 +1490,6 @@ LIMIT 100",
pub fn get_installed_extensions(&self) -> Result<()> {
let connstr = self.connstr.clone();
let compute_state = self.state.lock().unwrap().clone();
let pspec = compute_state.pspec.as_ref().expect("spec must be set");
let tenant_id = pspec.tenant_id;
let timeline_id = pspec.timeline_id;
thread::spawn(move || {
let rt = tokio::runtime::Builder::new_current_thread()
.enable_all()
@@ -1503,8 +1498,6 @@ LIMIT 100",
let result = rt
.block_on(crate::installed_extensions::get_installed_extensions(
connstr,
tenant_id,
timeline_id,
))
.expect("failed to get installed extensions");

9
compute_tools/src/http/api.rs
View File

@@ -205,15 +205,8 @@ async fn routes(req: Request<Body>, compute: &Arc<ComputeNode>) -> Response<Body
return Response::new(Body::from(msg));
}
let compute_state = compute.state.lock().unwrap().clone();
let pspec = compute_state.pspec.as_ref().expect("spec must be set");
let connstr = compute.connstr.clone();
let res = crate::installed_extensions::get_installed_extensions(
connstr,
pspec.tenant_id,
pspec.timeline_id,
)
.await;
let res = crate::installed_extensions::get_installed_extensions(connstr).await;
match res {
Ok(res) => render_json(Body::from(serde_json::to_string(&res).unwrap())),
Err(e) => render_json_error(

17
compute_tools/src/installed_extensions.rs
View File

@@ -3,8 +3,6 @@ use metrics::proto::MetricFamily;
use std::collections::HashMap;
use std::collections::HashSet;
use url::Url;
use utils::id::TenantId;
use utils::id::TimelineId;
use anyhow::Result;
use postgres::{Client, NoTls};
@@ -42,11 +40,7 @@ fn list_dbs(client: &mut Client) -> Result<Vec<String>> {
/// Connect to every database (see list_dbs above) and get the list of installed extensions.
/// Same extension can be installed in multiple databases with different versions,
/// we only keep the highest and lowest version across all databases.
pub async fn get_installed_extensions(
connstr: Url,
tenant_id: TenantId,
timeline_id: TimelineId,
) -> Result<InstalledExtensions> {
pub async fn get_installed_extensions(connstr: Url) -> Result<InstalledExtensions> {
let mut connstr = connstr.clone();
task::spawn_blocking(move || {
@@ -99,12 +93,7 @@ pub async fn get_installed_extensions(
};
INSTALLED_EXTENSIONS
.with_label_values(&[
&tenant_id.to_string(),
&timeline_id.to_string(),
&ext.extname,
&versions,
])
.with_label_values(&[&ext.extname, &versions])
.set(ext.n_databases as u64);
}
@@ -117,7 +106,7 @@ static INSTALLED_EXTENSIONS: Lazy<UIntGaugeVec> = Lazy::new(|| {
register_uint_gauge_vec!(
"installed_extensions",
"Number of databases where extension is installed, versions passed as label",
&["tenant_id", "timeline_id", "extension_name", "versions"]
&["extension_name", "versions"]
)
.expect("failed to define a metric")
});