mirror of
https://github.com/neondatabase/neon.git
synced 2026-01-14 17:02:56 +00:00
e5cc2f92c4
Refactors Compute::prepare_and_run. It's split into subroutines differently, to make it easier to attach tracing spans to the different stages. The high-level logic for waiting for Postgres to exit is moved to the caller. Replace 'env_logger' with 'tracing', and add `#instrument` directives to different stages fo the startup process. This is a fairly mechanical change, except for the changes in 'spec.rs'. 'spec.rs' contained some complicated formatting, where parts of log messages were printed directly to stdout with `print`s. That was a bit messed up because the log normally goes to stderr, but those lines were printed to stdout. In our docker images, stderr and stdout both go to the same place so you wouldn't notice, but I don't think it was intentional. This changes the log format to the default 'tracing_subscriber::format' format. It's different from the Postgres log format, however, and because both compute_tools and Postgres print to the same log, it's now a mix of two different formats. I'm not sure how the Grafana log parsing pipeline can handle that. If it's a problem, we can build custom formatter to change the compute_tools log format to be the same as Postgres's, like it was before this commit, or we can change the Postgres log format to match tracing_formatter's, or we can start printing compute_tool's log output to a different destination than Postgres
46 lines
1.3 KiB
Rust
46 lines
1.3 KiB
Rust
use anyhow::{anyhow, Result};
|
|
use postgres::Client;
|
|
use tokio_postgres::NoTls;
|
|
use tracing::{error, instrument};
|
|
|
|
use crate::compute::ComputeNode;
|
|
|
|
#[instrument(skip_all)]
|
|
pub fn create_writability_check_data(client: &mut Client) -> Result<()> {
|
|
let query = "
|
|
CREATE TABLE IF NOT EXISTS health_check (
|
|
id serial primary key,
|
|
updated_at timestamptz default now()
|
|
);
|
|
INSERT INTO health_check VALUES (1, now())
|
|
ON CONFLICT (id) DO UPDATE
|
|
SET updated_at = now();";
|
|
let result = client.simple_query(query)?;
|
|
if result.len() < 2 {
|
|
return Err(anyhow::format_err!("executed {} queries", result.len()));
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
#[instrument(skip_all)]
|
|
pub async fn check_writability(compute: &ComputeNode) -> Result<()> {
|
|
let (client, connection) = tokio_postgres::connect(compute.connstr.as_str(), NoTls).await?;
|
|
if client.is_closed() {
|
|
return Err(anyhow!("connection to postgres closed"));
|
|
}
|
|
tokio::spawn(async move {
|
|
if let Err(e) = connection.await {
|
|
error!("connection error: {}", e);
|
|
}
|
|
});
|
|
|
|
let result = client
|
|
.simple_query("UPDATE health_check SET updated_at = now() WHERE id = 1;")
|
|
.await?;
|
|
|
|
if result.len() != 1 {
|
|
return Err(anyhow!("statement can't be executed"));
|
|
}
|
|
Ok(())
|
|
}
|