Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 80 additions & 7 deletions oxa/oxa-cli/src/lead_input.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ pub fn board(path: &Path, uid: u32) -> Result<Board> {
board_and_app_quota(path, uid).map(|(board, _)| board)
}

/// Read the most recent complete shadow sample, excluding an interrupted final append.
/// Read the most recent complete Reader sample within the existing tail bound.
pub(crate) fn board_and_app_quota(path: &Path, uid: u32) -> Result<(Board, Option<AppQuota>)> {
let mut file = open(path, uid)?;
let length = file.metadata().map_err(|_| "cannot inspect board sample")?.len();
Expand All @@ -50,15 +50,26 @@ pub(crate) fn board_and_app_quota(path: &Path, uid: u32) -> Result<(Board, Optio
file.take(length - start)
.read_to_end(&mut tail)
.map_err(|_| "cannot read board sample")?;
let end = tail
let mut end = tail
.iter()
.rposition(|b| *b == b'\n')
.ok_or("no complete board sample")?;
let previous = tail[..end].iter().rposition(|b| *b == b'\n');
if previous.is_none() && start != 0 {
return Err("board sample exceeds limit");
loop {
let previous = tail[..end].iter().rposition(|b| *b == b'\n');
if previous.is_none() && start != 0 {
return Err("board sample exceeds limit");
}
let line = &tail[previous.map_or(0, |p| p + 1)..end];
let (board, app_quota, publication) = decode_board_sample(line)?;
if !publication {
return Ok((board, app_quota));
}
// Publication rows carry a Board for journal replay, not a Reader observation.
end = previous.ok_or("no Reader board sample")?;
}
let line = &tail[previous.map_or(0, |p| p + 1)..end];
}

fn decode_board_sample(line: &[u8]) -> Result<(Board, Option<AppQuota>, bool)> {
if line.len() as u64 > MAX_LEAD_SAMPLE_BYTES {
return Err("board sample exceeds limit");
}
Expand Down Expand Up @@ -89,7 +100,12 @@ pub(crate) fn board_and_app_quota(path: &Path, uid: u32) -> Result<(Board, Optio
let app_quota = sample
.get("app_quota")
.and_then(|quota| serde_json::from_value(quota.clone()).ok());
Ok((board, app_quota))
let publication = match sample.get("landing_publication") {
Some(record) if record.is_object() => true,
Some(_) => return Err("invalid publication sample"),
None => false,
};
Ok((board, app_quota, publication))
}

/// Consume the runner's existing versioned situation document, not worker transcripts/logs.
Expand Down Expand Up @@ -134,6 +150,63 @@ mod tests {
assert_eq!(board(&path, uid).unwrap_err(), "invalid board sample");
}

#[test]
fn publication_rows_do_not_refresh_or_hide_reader_samples() {
let env = TestEnv::new();
let reader = br#"{"schema_version":1,"observed_at":20,"board":{"observed_at":20,"entries":[]},"app_quota":{"core":{"limit":5000,"remaining":123,"resets_at":600}}}
"#;
let publications = br#"{"schema_version":1,"observed_at":30,"board":{"observed_at":30,"entries":[]},"landing_publication":{"step":"delivered"}}
"#;
let (path, uid) = fixture(&env, &[reader.as_slice(), publications.as_slice()].concat());
let (board, quota) = board_and_app_quota(&path, uid).unwrap();
assert_eq!(board.observed_at, 20);
assert_eq!(quota.unwrap().core.unwrap().remaining, 123);

let without_quota = br#"{"schema_version":1,"observed_at":25,"board":{"observed_at":25,"entries":[]}}
"#;
fs::write(
&path,
&[
reader.as_slice(),
without_quota.as_slice(),
publications.as_slice(),
]
.concat(),
)
.unwrap();
let (board, quota) = board_and_app_quota(&path, uid).unwrap();
assert_eq!(board.observed_at, 25);
assert!(quota.is_none());

fs::write(&path, publications).unwrap();
assert_eq!(
board_and_app_quota(&path, uid).err(),
Some("no Reader board sample")
);

let padded_publication = format!(
"{}\n",
serde_json::json!({
"schema_version": 1,
"observed_at": 40,
"board": {"observed_at": 40, "entries": []},
"landing_publication": {"step": "delivered"},
"padding": "x".repeat(MAX_LEAD_SAMPLE_BYTES as usize * 3 / 5),
})
);
fs::write(
&path,
&[
reader.as_slice(),
padded_publication.as_bytes(),
padded_publication.as_bytes(),
]
.concat(),
)
.unwrap();
assert!(board_and_app_quota(&path, uid).is_err());
}

#[test]
fn reads_a_full_paginated_shadow_board() {
use oxa_work::board::Entry;
Expand Down
Loading