mirror of
https://github.com/openai/codex.git
synced 2026-05-02 10:26:45 +00:00
feat: log db better maintenance (#16330)
Run a DB clean-up more frequently with an incremental `VACCUM` in it
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
use super::*;
|
||||
|
||||
const LOG_RETENTION_DAYS: i64 = 10;
|
||||
|
||||
impl StateRuntime {
|
||||
pub async fn insert_log(&self, entry: &LogEntry) -> anyhow::Result<()> {
|
||||
self.insert_logs(std::slice::from_ref(entry)).await
|
||||
@@ -291,6 +293,22 @@ WHERE id IN (
|
||||
Ok(result.rows_affected())
|
||||
}
|
||||
|
||||
pub(crate) async fn run_logs_startup_maintenance(&self) -> anyhow::Result<()> {
|
||||
let Some(cutoff) =
|
||||
Utc::now().checked_sub_signed(chrono::Duration::days(LOG_RETENTION_DAYS))
|
||||
else {
|
||||
return Ok(());
|
||||
};
|
||||
self.delete_logs_before(cutoff.timestamp()).await?;
|
||||
sqlx::query("PRAGMA wal_checkpoint(TRUNCATE)")
|
||||
.execute(self.logs_pool.as_ref())
|
||||
.await?;
|
||||
sqlx::query("PRAGMA incremental_vacuum")
|
||||
.execute(self.logs_pool.as_ref())
|
||||
.await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Query logs with optional filters.
|
||||
pub async fn query_logs(&self, query: &LogQuery) -> anyhow::Result<Vec<LogRow>> {
|
||||
let mut builder = QueryBuilder::<Sqlite>::new(
|
||||
@@ -520,6 +538,7 @@ mod tests {
|
||||
use crate::logs_db_path;
|
||||
use crate::migrations::LOGS_MIGRATOR;
|
||||
use crate::state_db_path;
|
||||
use chrono::Utc;
|
||||
use pretty_assertions::assert_eq;
|
||||
use sqlx::SqlitePool;
|
||||
use sqlx::migrate::Migrator;
|
||||
@@ -607,7 +626,7 @@ mod tests {
|
||||
sqlx::query(
|
||||
"INSERT INTO logs (ts, ts_nanos, level, target, message, module_path, file, line, thread_id, process_uuid, estimated_bytes) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
|
||||
)
|
||||
.bind(1_i64)
|
||||
.bind(Utc::now().timestamp())
|
||||
.bind(0_i64)
|
||||
.bind("INFO")
|
||||
.bind("cli")
|
||||
@@ -676,6 +695,84 @@ mod tests {
|
||||
let _ = tokio::fs::remove_dir_all(codex_home).await;
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn init_recreates_legacy_logs_db_when_log_version_changes() {
|
||||
let codex_home = unique_temp_dir();
|
||||
tokio::fs::create_dir_all(&codex_home)
|
||||
.await
|
||||
.expect("create codex home");
|
||||
let legacy_logs_path = codex_home.join("logs_1.sqlite");
|
||||
let pool = SqlitePool::connect_with(
|
||||
SqliteConnectOptions::new()
|
||||
.filename(&legacy_logs_path)
|
||||
.create_if_missing(true),
|
||||
)
|
||||
.await
|
||||
.expect("open legacy logs db");
|
||||
LOGS_MIGRATOR
|
||||
.run(&pool)
|
||||
.await
|
||||
.expect("apply legacy logs schema");
|
||||
sqlx::query(
|
||||
"INSERT INTO logs (ts, ts_nanos, level, target, feedback_log_body, module_path, file, line, thread_id, process_uuid, estimated_bytes) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
|
||||
)
|
||||
.bind(1_i64)
|
||||
.bind(0_i64)
|
||||
.bind("INFO")
|
||||
.bind("cli")
|
||||
.bind("legacy-log-row")
|
||||
.bind("mod")
|
||||
.bind("main.rs")
|
||||
.bind(7_i64)
|
||||
.bind("thread-1")
|
||||
.bind("proc-1")
|
||||
.bind(16_i64)
|
||||
.execute(&pool)
|
||||
.await
|
||||
.expect("insert legacy log row");
|
||||
pool.close().await;
|
||||
|
||||
let runtime = StateRuntime::init(codex_home.clone(), "test-provider".to_string())
|
||||
.await
|
||||
.expect("initialize runtime");
|
||||
|
||||
assert!(
|
||||
!legacy_logs_path.exists(),
|
||||
"legacy logs db should be removed when the version changes"
|
||||
);
|
||||
assert!(
|
||||
logs_db_path(codex_home.as_path()).exists(),
|
||||
"current logs db should be recreated during init"
|
||||
);
|
||||
assert!(
|
||||
runtime
|
||||
.query_logs(&LogQuery::default())
|
||||
.await
|
||||
.expect("query recreated logs db")
|
||||
.is_empty()
|
||||
);
|
||||
|
||||
let _ = tokio::fs::remove_dir_all(codex_home).await;
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn init_configures_logs_db_with_incremental_auto_vacuum() {
|
||||
let codex_home = unique_temp_dir();
|
||||
let _runtime = StateRuntime::init(codex_home.clone(), "test-provider".to_string())
|
||||
.await
|
||||
.expect("initialize runtime");
|
||||
|
||||
let pool = open_db_pool(logs_db_path(codex_home.as_path()).as_path()).await;
|
||||
let auto_vacuum = sqlx::query_scalar::<_, i64>("PRAGMA auto_vacuum")
|
||||
.fetch_one(&pool)
|
||||
.await
|
||||
.expect("read auto_vacuum pragma");
|
||||
assert_eq!(auto_vacuum, 2);
|
||||
pool.close().await;
|
||||
|
||||
let _ = tokio::fs::remove_dir_all(codex_home).await;
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn format_feedback_log_line_matches_feedback_formatter_shape() {
|
||||
assert_eq!(
|
||||
|
||||
Reference in New Issue
Block a user