Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstairs state machine refactoring (3/3) #1577

Open
wants to merge 21 commits into
base: mkeeter/explicit-stop-state
Choose a base branch
from
+1,248 −1,333
Open

Upstairs state machine refactoring (3/3) #1577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
93af30b
The Grand Refactoring of DsState
mkeeter Nov 22, 2024
671ab54
Remove needs_replay in favor of a returned value
mkeeter Nov 25, 2024
28df820
All tests passing
mkeeter Nov 25, 2024
7a7a60e
Update OpenAPI stuff
mkeeter Nov 25, 2024
44ce475
Fix cmon
mkeeter Nov 25, 2024
280c357
All tests passing!
mkeeter Nov 25, 2024
2390a68
Allow reconciliation after replacement
mkeeter Dec 2, 2024
75d5c15
Fix valid replacement states for other DS
mkeeter Dec 2, 2024
26be47d
Remove duplicate ClientStopReason in ClientRunResult
mkeeter Dec 2, 2024
ef7bb0c
Correctly skip jobs on reinitialize
mkeeter Dec 2, 2024
092a86f
Cleaning up reinitialize
mkeeter Dec 3, 2024
fc334f3
Update comments
mkeeter Dec 3, 2024
1b633d6
Cleaner ConnectionMode handling during replacement
mkeeter Dec 3, 2024
9a1ff37
Update OpenAPI docs
mkeeter Dec 3, 2024
b27943b
Fix notify-nexus code
mkeeter Dec 3, 2024
3ad1361
Don't autopromote when a client is disabled
mkeeter Dec 11, 2024
958627d
Concerns!
mkeeter Dec 11, 2024
a1b9eee
Reimplement checked_state_transition
mkeeter Dec 12, 2024
a033afb
Add RUST_BACKTRACE=1
mkeeter Dec 12, 2024
6a1bde5
Allow Connecting -> Connecting transition
mkeeter Dec 12, 2024
26e7d50
Allow Replacing -> New with auto_promote = true
mkeeter Dec 12, 2024
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
1 change: 1 addition & 0 deletions .github/buildomat/jobs/test-ds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ for t in "$input/bins/"*.gz; do
done

export BINDIR=/var/tmp/bins
export RUST_BACKTRACE=1

banner test_ds
ptime -m bash "$input/scripts/test_ds.sh"
Expand Down
1 change: 1 addition & 0 deletions .github/buildomat/jobs/test-live-repair.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ for t in "$input/bins/"*.gz; do
done

export BINDIR=/var/tmp/bins
export RUST_BACKTRACE=1

echo "BINDIR is $BINDIR"
echo "bindir contains:"
Expand Down
1 change: 1 addition & 0 deletions .github/buildomat/jobs/test-memory.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ for t in "$input/rbins/"*.gz; do
done

export BINDIR=/var/tmp/bins
export RUST_BACKTRACE=1

banner setup
pfexec plimit -n 9123456 $$
Expand Down
1 change: 1 addition & 0 deletions .github/buildomat/jobs/test-region-create.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ for t in "$input/rbins/"*.gz; do
done

export BINDIR=/var/tmp/bins
export RUST_BACKTRACE=1

banner region
pfexec plimit -n 9123456 $$
Expand Down
1 change: 1 addition & 0 deletions .github/buildomat/jobs/test-repair.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ for t in "$input/bins/"*.gz; do
done

export BINDIR=/var/tmp/bins
export RUST_BACKTRACE=1

echo "Setup self timeout"
# Give this test two hours to finish
Expand Down
1 change: 1 addition & 0 deletions .github/buildomat/jobs/test-replay.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ for t in "$input/bins/"*.gz; do
done

export BINDIR=/var/tmp/bins
export RUST_BACKTRACE=1
banner setup

echo "Setup self timeout"
Expand Down
1 change: 1 addition & 0 deletions .github/buildomat/jobs/test-up-encrypted.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ for t in "$input/bins/"*.gz; do
done

export BINDIR=/var/tmp/bins
export RUST_BACKTRACE=1

# Give this test one hour to finish
jobpid=$$; (sleep $(( 60 * 60 )); banner fail-timeout; ps -ef; zfs list;kill $jobpid) &
Expand Down
1 change: 1 addition & 0 deletions .github/buildomat/jobs/test-up-unencrypted.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ for t in "$input/bins/"*.gz; do
done

export BINDIR=/var/tmp/bins
export RUST_BACKTRACE=1

# Give this test two hours to finish
jobpid=$$; (sleep $(( 120 * 60 )); banner fail-timeout; ps -ef; zfs list;kill $jobpid) &
Expand Down
52 changes: 38 additions & 14 deletions cmon/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ use strum::IntoEnumIterator;
use strum_macros::EnumIter;
use tokio::time::{sleep, Duration};

use crucible::{Arg, ClientStopReason, DsState};
use crucible::{
Arg, ClientStopReason, ConnectionMode, DsState, NegotiationState,
};

/// Connect to crucible control server
#[derive(Parser, Debug)]
Expand Down Expand Up @@ -87,24 +89,46 @@ enum Action {
// Translate a DsState into a three letter string for printing.
fn short_state(dss: DsState) -> String {
match dss {
DsState::New
| DsState::Stopping(ClientStopReason::NegotiationFailed(..)) => {
"NEW".to_string()
}
DsState::WaitActive => "WAC".to_string(),
DsState::WaitQuorum => "WAQ".to_string(),
DsState::Reconcile => "REC".to_string(),
DsState::Connecting {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was thinking about how to present this, but what you have done here is fine for now and if I come up with something I like better, I'll put out a PR for it

state: NegotiationState::WaitActive,
..
} => "WAC".to_string(),

DsState::Connecting {
state: NegotiationState::WaitQuorum,
..
} => "WAQ".to_string(),
DsState::Connecting {
state: NegotiationState::Reconcile,
..
} => "REC".to_string(),
DsState::Active => "ACT".to_string(),
DsState::Faulted | DsState::Stopping(ClientStopReason::Fault(..)) => {
"FLT".to_string()
DsState::Connecting {
state: NegotiationState::LiveRepairReady,
..
} => "LRR".to_string(),
DsState::Stopping(ClientStopReason::NegotiationFailed(..))
| DsState::Connecting {
mode: ConnectionMode::New,
..
} => "NEW".to_string(),
DsState::Connecting {
mode: ConnectionMode::Faulted,
..
}
DsState::LiveRepairReady => "LRR".to_string(),
| DsState::Stopping(ClientStopReason::Fault(..)) => "FLT".to_string(),
DsState::LiveRepair => "LR".to_string(),
DsState::Offline => "OFF".to_string(),
DsState::Connecting {
mode: ConnectionMode::Offline,
..
} => "OFF".to_string(),
DsState::Stopping(ClientStopReason::Deactivated) => "DAV".to_string(),
DsState::Stopping(ClientStopReason::Disabled) => "DIS".to_string(),
DsState::Stopping(ClientStopReason::Replacing) => "RPC".to_string(),
DsState::Replaced => "RPD".to_string(),
DsState::Stopping(ClientStopReason::Replacing)
| DsState::Connecting {
mode: ConnectionMode::Replaced,
..
} => "RPD".to_string(),
}
}

Expand Down
Loading