Make start evidence atomic and recover only bound durable outcomes
Rust development slice / linux (push) Failing after 7s
Rust development slice / linux (push) Failing after 7s
This commit is contained in:
@@ -78,7 +78,7 @@ pub fn lock_state(dir: &Path, uid: u32) -> Result<fs::File> {
|
||||
f.try_lock_exclusive()?;
|
||||
Ok(f)
|
||||
}
|
||||
pub use rmm_agent_core::ledger::{bounded_journal_capacity, consume, finish};
|
||||
pub use rmm_agent_core::ledger::{bounded_journal_capacity, consume, finish, persist_outcome};
|
||||
|
||||
pub fn open_ledger(dir: &Path, uid: u32) -> Result<rusqlite::Connection> {
|
||||
use std::os::unix::fs::OpenOptionsExt;
|
||||
@@ -98,6 +98,16 @@ pub fn open_ledger(dir: &Path, uid: u32) -> Result<rusqlite::Connection> {
|
||||
fs::File::open(dir)?.sync_all()?;
|
||||
Ok(db)
|
||||
}
|
||||
/// Atomically reserve and persist the exact original signed request before effect.
|
||||
pub fn begin_execution(
|
||||
db: &mut rusqlite::Connection,
|
||||
permit: &ExecutionPermitPayload,
|
||||
request: &Request,
|
||||
) -> Result<()> {
|
||||
let recorded_at = Utc::now();
|
||||
let boot = Uuid::parse_str(&rmm_agent_linux::boot_id()?)?;
|
||||
rmm_agent_core::ledger::begin_execution(db, permit, request, boot, recorded_at)
|
||||
}
|
||||
/// Persist the same exact request/boot/time evidence through the shared ledger.
|
||||
pub fn save_start(
|
||||
db: &rusqlite::Connection,
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
use anyhow::{Result, ensure};
|
||||
use rmm_domain::jobs::Action;
|
||||
use rmm_privileged_helper::{
|
||||
Binding, Outcome, Request, consume, control, finish, lock_state, open_ledger, private_path,
|
||||
reconcile,
|
||||
Binding, Outcome, Request, control, finish, lock_state, open_ledger, private_path, reconcile,
|
||||
};
|
||||
use serde::Deserialize;
|
||||
use std::{
|
||||
@@ -442,8 +441,7 @@ fn handle(
|
||||
if let Some(apt) = &apt {
|
||||
apt.verify_retry_history(db)?;
|
||||
}
|
||||
consume(db, &permit)?;
|
||||
rmm_privileged_helper::save_start(db, &permit, &request)?;
|
||||
rmm_privileged_helper::begin_execution(db, &permit, &request)?;
|
||||
let mut outcome =
|
||||
if !clock.trusted() || config.binding.verify(&request, chrono::Utc::now()).is_err() {
|
||||
Outcome {
|
||||
|
||||
@@ -237,7 +237,7 @@ fn reopen_consumption_duplicate_grant_attempt_unknown_and_resource_lock() {
|
||||
let lock = lock_state(&path, uid).unwrap();
|
||||
assert!(lock_state(&path, uid).is_err());
|
||||
let mut db = open_ledger(&path, uid).unwrap();
|
||||
consume(&mut db, &permit).unwrap();
|
||||
begin_execution(&mut db, &permit, &request).unwrap();
|
||||
drop(db);
|
||||
let mut db = open_ledger(&path, uid).unwrap();
|
||||
assert!(consume(&mut db, &permit).is_err());
|
||||
@@ -248,17 +248,26 @@ fn reopen_consumption_duplicate_grant_attempt_unknown_and_resource_lock() {
|
||||
replacement.job_id = Uuid::new_v4();
|
||||
replacement.attempt_id = Uuid::new_v4();
|
||||
assert!(consume(&mut db, &replacement).is_err());
|
||||
// Only definitive evidence releases the resource, not an ACK or new grant.
|
||||
// A contradictory completion cannot overwrite original unknown evidence.
|
||||
let mut definitive = Outcome::unknown("");
|
||||
definitive.state = "succeeded".into();
|
||||
finish(&db, &permit, &definitive).unwrap();
|
||||
assert!(finish(&db, &permit, &definitive).is_err());
|
||||
assert!(consume(&mut db, &permit).is_err());
|
||||
replacement.job_id = permit.job_id;
|
||||
replacement.attempt_id = permit.attempt_id;
|
||||
assert!(consume(&mut db, &replacement).is_err());
|
||||
replacement.job_id = Uuid::new_v4();
|
||||
replacement.attempt_id = Uuid::new_v4();
|
||||
consume(&mut db, &replacement).unwrap();
|
||||
assert!(consume(&mut db, &replacement).is_err());
|
||||
assert_eq!(
|
||||
db.query_row::<u32, _, _>(
|
||||
"SELECT count(*) FROM consumed WHERE result IS NULL",
|
||||
[],
|
||||
|r| r.get(0)
|
||||
)
|
||||
.unwrap(),
|
||||
1
|
||||
);
|
||||
drop(db);
|
||||
drop(lock);
|
||||
fs::remove_dir_all(path).unwrap();
|
||||
@@ -327,7 +336,7 @@ fn two_helper_connections_share_exact_lock_and_sqlite_consumption() {
|
||||
);
|
||||
let mut general = open_ledger(&path, uid).unwrap();
|
||||
let mut apt = open_ledger(&path, uid).unwrap();
|
||||
consume(&mut general, &permit).unwrap();
|
||||
begin_execution(&mut general, &permit, &request).unwrap();
|
||||
assert!(consume(&mut apt, &permit).is_err());
|
||||
let mut other = permit.clone();
|
||||
other.grant_id = Uuid::new_v4();
|
||||
|
||||
Reference in New Issue
Block a user