Skip to content

Commit

Permalink
[π˜€π—½π—Ώ] initial version
Browse files Browse the repository at this point in the history 
Created using spr 1.3.4
  • Loading branch information
@sunshowers
sunshowers committed Oct 26, 2023
2 parents 3c6ae58 + 1fa026e commit 32b595b
Show file tree
Hide file tree
Showing 5 changed files with 110 additions and 28 deletions.
50 changes: 48 additions & 2 deletions update-engine/src/buffer.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,13 @@ impl<S: StepSpec> EventStore<S> {
// index.
let root_event_index = RootEventIndex(event.event_index);

let actions =
self.recurse_for_step_event(&event, 0, None, root_event_index);
let actions = self.recurse_for_step_event(
&event,
0,
None,
root_event_index,
event.total_elapsed,
);
if let Some(new_execution) = actions.new_execution {
if new_execution.nest_level == 0 {
self.root_execution_id = Some(new_execution.execution_id);
Expand Down Expand Up @@ -312,6 +317,7 @@ impl<S: StepSpec> EventStore<S> {
nest_level: usize,
parent_sort_key: Option<&StepSortKey>,
root_event_index: RootEventIndex,
root_total_elapsed: Duration,
) -> RecurseActions {
let mut new_execution = None;
let (step_key, progress_key) = match &event.kind {
Expand Down Expand Up @@ -365,6 +371,8 @@ impl<S: StepSpec> EventStore<S> {
let info = CompletionInfo {
attempt: *attempt,
outcome,
root_total_elapsed,
leaf_total_elapsed: event.total_elapsed,
step_elapsed: *step_elapsed,
attempt_elapsed: *attempt_elapsed,
};
Expand Down Expand Up @@ -405,6 +413,8 @@ impl<S: StepSpec> EventStore<S> {
let info = CompletionInfo {
attempt: *last_attempt,
outcome,
root_total_elapsed,
leaf_total_elapsed: event.total_elapsed,
step_elapsed: *step_elapsed,
attempt_elapsed: *attempt_elapsed,
};
Expand Down Expand Up @@ -432,6 +442,8 @@ impl<S: StepSpec> EventStore<S> {
total_attempts: *total_attempts,
message: message.clone(),
causes: causes.clone(),
root_total_elapsed,
leaf_total_elapsed: event.total_elapsed,
step_elapsed: *step_elapsed,
attempt_elapsed: *attempt_elapsed,
};
Expand All @@ -456,6 +468,8 @@ impl<S: StepSpec> EventStore<S> {
let info = AbortInfo {
attempt: *attempt,
message: message.clone(),
root_total_elapsed,
leaf_total_elapsed: event.total_elapsed,
step_elapsed: *step_elapsed,
attempt_elapsed: *attempt_elapsed,
};
Expand All @@ -481,6 +495,7 @@ impl<S: StepSpec> EventStore<S> {
nest_level + 1,
parent_sort_key.as_ref(),
root_event_index,
root_total_elapsed,
);
if let Some(nested_new_execution) = &actions.new_execution {
// Add an edge from the parent node to the new execution's root node.
Expand Down Expand Up @@ -1164,6 +1179,8 @@ impl<S: StepSpec> StepStatus<S> {
pub struct CompletionInfo {
pub attempt: usize,
pub outcome: StepOutcome<NestedSpec>,
pub root_total_elapsed: Duration,
pub leaf_total_elapsed: Duration,
pub step_elapsed: Duration,
pub attempt_elapsed: Duration,
}
Expand All @@ -1179,11 +1196,23 @@ pub enum FailureReason {
},
}

impl FailureReason {
/// Returns the [`FailureInfo`] if present.
pub fn info(&self) -> Option<&FailureInfo> {
match self {
Self::StepFailed(info) => Some(info),
Self::ParentFailed { .. } => None,
}
}
}

#[derive(Clone, Debug)]
pub struct FailureInfo {
pub total_attempts: usize,
pub message: String,
pub causes: Vec<String>,
pub root_total_elapsed: Duration,
pub leaf_total_elapsed: Duration,
pub step_elapsed: Duration,
pub attempt_elapsed: Duration,
}
Expand All @@ -1199,6 +1228,16 @@ pub enum AbortReason {
},
}

impl AbortReason {
/// Returns the [`AbortInfo`] if present.
pub fn info(&self) -> Option<&AbortInfo> {
match self {
Self::StepAborted(info) => Some(info),
Self::ParentAborted { .. } => None,
}
}
}

#[derive(Clone, Debug)]
pub enum WillNotBeRunReason {
/// A preceding step failed.
Expand Down Expand Up @@ -1230,6 +1269,13 @@ pub enum WillNotBeRunReason {
pub struct AbortInfo {
pub attempt: usize,
pub message: String,

/// The total elapsed time as reported by the root event.
pub root_total_elapsed: Duration,

/// The total elapsed time as reported by the leaf execution event, for
/// nested events.
pub leaf_total_elapsed: Duration,
pub step_elapsed: Duration,
pub attempt_elapsed: Duration,
}
Expand Down
32 changes: 20 additions & 12 deletions wicket/src/state/inventory.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
use anyhow::anyhow;
use once_cell::sync::Lazy;
use ratatui::text::Text;
use serde::{Deserialize, Serialize};
use std::collections::BTreeMap;
use std::fmt::Display;
Expand Down Expand Up @@ -185,7 +184,7 @@ impl Component {
}
}

// The component type and its slot.
/// The component type and its slot.
#[derive(
Debug,
Clone,
Expand All @@ -205,27 +204,24 @@ pub enum ComponentId {
}

impl ComponentId {
pub fn name(&self) -> String {
self.to_string()
pub fn to_string_uppercase(&self) -> String {
let mut s = self.to_string();
s.make_ascii_uppercase();
s
}
}

/// Prints the component type in standard case.
impl Display for ComponentId {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
ComponentId::Sled(i) => write!(f, "SLED {}", i),
ComponentId::Switch(i) => write!(f, "SWITCH {}", i),
ComponentId::Sled(i) => write!(f, "sled {}", i),
ComponentId::Switch(i) => write!(f, "switch {}", i),
ComponentId::Psc(i) => write!(f, "PSC {}", i),
}
}
}

impl From<ComponentId> for Text<'_> {
fn from(value: ComponentId) -> Self {
value.to_string().into()
}
}

pub struct ParsableComponentId<'a> {
pub sp_type: &'a str,
pub i: &'a str,
Expand Down Expand Up @@ -269,3 +265,15 @@ impl PowerState {
}
}
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn component_id_display() {
assert_eq!(ComponentId::Sled(0).to_string(), "sled 0");
assert_eq!(ComponentId::Switch(1).to_string(), "switch 1");
assert_eq!(ComponentId::Psc(2).to_string(), "PSC 2");
}
}
2 changes: 1 addition & 1 deletion wicket/src/ui/panes/overview.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ impl Control for InventoryView {
let title_bar = Paragraph::new(Line::from(vec![
Span::styled("OXIDE RACK / ", border_style),
Span::styled(
state.rack_state.selected.to_string(),
state.rack_state.selected.to_string_uppercase(),
component_style,
),
]))
Expand Down
52 changes: 40 additions & 12 deletions wicket/src/ui/panes/update.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ impl UpdatePane {
tree_state,
items: ALL_COMPONENT_IDS
.iter()
.map(|id| TreeItem::new(*id, vec![]))
.map(|id| TreeItem::new(id.to_string_uppercase(), vec![]))
.collect(),
help: vec![
("Expand", "<e>"),
Expand Down Expand Up @@ -531,7 +531,10 @@ impl UpdatePane {
) {
let popup_builder = PopupBuilder {
header: Line::from(vec![Span::styled(
format!("START UPDATE: {}", state.rack_state.selected),
format!(
"START UPDATE: {}",
state.rack_state.selected.to_string_uppercase()
),
style::header(true),
)]),
body: Text::from(vec![Line::from(vec![Span::styled(
Expand Down Expand Up @@ -561,7 +564,10 @@ impl UpdatePane {
) {
let popup_builder = PopupBuilder {
header: Line::from(vec![Span::styled(
format!("START UPDATE: {}", state.rack_state.selected),
format!(
"START UPDATE: {}",
state.rack_state.selected.to_string_uppercase()
),
style::header(true),
)]),
body: Text::from(vec![Line::from(vec![Span::styled(
Expand Down Expand Up @@ -594,7 +600,10 @@ impl UpdatePane {

let popup_builder = PopupBuilder {
header: Line::from(vec![Span::styled(
format!("START UPDATE FAILED: {}", state.rack_state.selected),
format!(
"START UPDATE FAILED: {}",
state.rack_state.selected.to_string_uppercase()
),
style::failed_update(),
)]),
body,
Expand Down Expand Up @@ -635,7 +644,10 @@ impl UpdatePane {

let popup_builder = PopupBuilder {
header: Line::from(vec![Span::styled(
format!("ABORT UPDATE: {}", state.rack_state.selected),
format!(
"ABORT UPDATE: {}",
state.rack_state.selected.to_string_uppercase()
),
style::header(true),
)]),
body,
Expand All @@ -662,7 +674,10 @@ impl UpdatePane {
) {
let popup_builder = PopupBuilder {
header: Line::from(vec![Span::styled(
format!("ABORT UPDATE: {}", state.rack_state.selected),
format!(
"ABORT UPDATE: {}",
state.rack_state.selected.to_string_uppercase()
),
style::header(true),
)]),
body: Text::from(vec![Line::from(vec![Span::styled(
Expand Down Expand Up @@ -695,7 +710,10 @@ impl UpdatePane {

let popup_builder = PopupBuilder {
header: Line::from(vec![Span::styled(
format!("ABORT UPDATE FAILED: {}", state.rack_state.selected),
format!(
"ABORT UPDATE FAILED: {}",
state.rack_state.selected.to_string_uppercase()
),
style::failed_update(),
)]),
body,
Expand All @@ -721,7 +739,10 @@ impl UpdatePane {
) {
let popup_builder = PopupBuilder {
header: Line::from(vec![Span::styled(
format!("CLEAR UPDATE STATE: {}", state.rack_state.selected),
format!(
"CLEAR UPDATE STATE: {}",
state.rack_state.selected.to_string_uppercase()
),
style::header(true),
)]),
body: Text::from(vec![Line::from(vec![Span::styled(
Expand Down Expand Up @@ -756,7 +777,7 @@ impl UpdatePane {
header: Line::from(vec![Span::styled(
format!(
"CLEAR UPDATE STATE FAILED: {}",
state.rack_state.selected
state.rack_state.selected.to_string_uppercase()
),
style::failed_update(),
)]),
Expand Down Expand Up @@ -830,7 +851,7 @@ impl UpdatePane {
})
})
.collect();
TreeItem::new(*id, children)
TreeItem::new(id.to_string_uppercase(), children)
})
.collect();
}
Expand Down Expand Up @@ -1107,7 +1128,11 @@ impl UpdatePane {
// `overview` pane.
let command = self.ignition.selected_command();
let selected = state.rack_state.selected;
info!(self.log, "Sending {command:?} to {selected}");
info!(
self.log,
"Sending {command:?} to {}",
selected.to_string_uppercase()
);
self.popup = None;
Some(Action::Ignition(selected, command))
}
Expand Down Expand Up @@ -1378,7 +1403,10 @@ impl UpdatePane {
// Draw the title/tab bar
let title_bar = Paragraph::new(Line::from(vec![
Span::styled("UPDATE STATUS / ", border_style),
Span::styled(state.rack_state.selected.to_string(), header_style),
Span::styled(
state.rack_state.selected.to_string_uppercase(),
header_style,
),
]))
.block(block.clone());
frame.render_widget(title_bar, self.title_rect);
Expand Down
2 changes: 1 addition & 1 deletion wicket/src/ui/widgets/ignition.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ impl IgnitionPopup {
) -> PopupBuilder<'static> {
PopupBuilder {
header: Line::from(vec![Span::styled(
format!("IGNITION: {}", component),
format!("IGNITION: {}", component.to_string_uppercase()),
style::header(true),
)]),
body: Text {
Expand Down

0 comments on commit 32b595b

Please sign in to comment.