Skip to content

server: extend API request queue's memory of prior requests #880

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

Merged
gjcolombo merged 8 commits into from
Mar 11, 2025
Merged

server: extend API request queue's memory of prior requests #880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2412bbd
server: extend API request queue's memory of prior requests
gjcolombo Mar 4, 2025
46d860b
merge master into refactor-server-request-queue
gjcolombo Mar 10, 2025
5be01dd
server: minor PR feedback
gjcolombo Mar 10, 2025
29ea5fc
server: requiescat in pace, Disposition
gjcolombo Mar 10, 2025
58cb957
server: aww yiss let's proptest some stuff
gjcolombo Mar 11, 2025
81dde61
server: even more proptesting
gjcolombo Mar 11, 2025
0178609
server: fix arrangement of queuing routines
gjcolombo Mar 11, 2025
152287d
server: allow stop requests with a pending migration out
gjcolombo Mar 11, 2025
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 Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bin/propolis-server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ ring.workspace = true
slog = { workspace = true, features = [ "max_level_trace", "release_max_level_debug" ] }
expectorate.workspace = true
mockall.workspace = true
proptest.workspace = true

[features]
default = []
Expand All @@ -83,7 +84,6 @@ omicron-build = ["propolis/omicron-build"]

# Falcon builds require corresponding bits turned on in the dependency libs
falcon = ["propolis/falcon"]

# Testing necessitates injecting failures which should hopefully be rare or even
# never occur on real otherwise-unperturbed systems. We conditionally compile
# code supporting failure injection to avoid the risk of somehow injecting
Expand Down
15 changes: 6 additions & 9 deletions bin/propolis-server/src/lib/vm/active.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ impl ActiveVm {

self.state_driver_queue
.queue_external_request(match requested {
InstanceStateRequested::Run => ExternalRequest::Start,
InstanceStateRequested::Stop => ExternalRequest::Stop,
InstanceStateRequested::Reboot => ExternalRequest::Reboot,
InstanceStateRequested::Run => ExternalRequest::start(),
InstanceStateRequested::Stop => ExternalRequest::stop(),
InstanceStateRequested::Reboot => ExternalRequest::reboot(),
})
.map_err(Into::into)
}
Expand All @@ -79,10 +79,7 @@ impl ActiveVm {
websock: dropshot::WebsocketConnection,
) -> Result<(), VmError> {
Ok(self.state_driver_queue.queue_external_request(
ExternalRequest::MigrateAsSource {
migration_id,
websock: websock.into(),
},
ExternalRequest::migrate_as_source(migration_id, websock),
)?)
}

Expand All @@ -107,11 +104,11 @@ impl ActiveVm {
) -> Result<(), VmError> {
self.state_driver_queue
.queue_external_request(
ExternalRequest::ReconfigureCrucibleVolume {
ExternalRequest::reconfigure_crucible_volume(
backend_id,
new_vcr_json,
result_tx,
},
),
)
.map_err(Into::into)
}
Expand Down
Loading