WIP: update to hyper v1

oxidecomputer · Aug 21, 2024 · 575e66a · 575e66a
1 parent 64350cd
commit 575e66a
Show file tree

Hide file tree

Showing 12 changed files with 331 additions and 143 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -106,7 +106,8 @@ clap = "4.2"
 const_format = "0.2"
 crossbeam-channel = "0.5"
 ctrlc = "3.2"
-dropshot = { git = "https://github.com/oxidecomputer/dropshot", branch = "main" }
+# dropshot = { git = "https://github.com/oxidecomputer/dropshot", branch = "main" }
+dropshot = { git = "https://github.com/seanmonstar/dropshot", branch = "hyper-v1-2.4-own-body" }
 erased-serde = "0.4"
 errno = "0.2.8"
 escargot = "0.5.8"
@@ -116,8 +117,8 @@ futures = "0.3"
 futures-util = "0.3.21"
 flate2 = "1.0.28"
 hex = "0.4.3"
-http = "0.2.9"
-hyper = "0.14"
+http = "1.1.0"
+hyper = "1.0"
 indicatif = "0.17.3"
 inventory = "0.3.0"
 kstat-rs = "0.2.3"

diff --git a/bin/mock-server/src/lib/lib.rs b/bin/mock-server/src/lib/lib.rs
@@ -397,15 +397,15 @@ mod serial {
     use std::sync::atomic::{AtomicBool, Ordering};
     use std::sync::Arc;
 
+    use dropshot::WebsocketConnectionRaw;
     use futures::StreamExt;
-    use hyper::upgrade::Upgraded;
     use tokio::sync::{mpsc, Notify};
     use tokio_tungstenite::tungstenite::protocol::{
         frame::coding::CloseCode, CloseFrame,
     };
     use tokio_tungstenite::WebSocketStream;
 
-    type WsConn = WebSocketStream<Upgraded>;
+    type WsConn = WebSocketStream<WebsocketConnectionRaw>;
 
     const DEFAULT_MAX_LEN: usize = 1024;
 

diff --git a/bin/propolis-server/Cargo.toml b/bin/propolis-server/Cargo.toml
@@ -30,7 +30,6 @@ crucible-client-types.workspace = true
 dropshot = { workspace = true, features = ["usdt-probes"] }
 erased-serde.workspace = true
 futures.workspace = true
-http.workspace = true
 hyper.workspace = true
 internal-dns.workspace = true
 kstat-rs.workspace = true

diff --git a/bin/propolis-server/src/lib/migrate/mod.rs b/bin/propolis-server/src/lib/migrate/mod.rs
@@ -25,7 +25,7 @@ pub(crate) trait MigrateConn:
 }
 
 impl MigrateConn for tokio_tungstenite::MaybeTlsStream<tokio::net::TcpStream> {}
-impl MigrateConn for hyper::upgrade::Upgraded {}
+impl MigrateConn for dropshot::WebsocketConnectionRaw {}
 
 #[derive(Copy, Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
 pub enum MigrateRole {

diff --git a/bin/propolis-server/src/lib/serial/mod.rs b/bin/propolis-server/src/lib/serial/mod.rs
@@ -14,10 +14,10 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use crate::serial::history_buffer::{HistoryBuffer, SerialHistoryOffset};
+use dropshot::WebsocketConnectionRaw;
 use futures::future::Fuse;
 use futures::stream::SplitSink;
 use futures::{FutureExt, SinkExt, StreamExt};
-use hyper::upgrade::Upgraded;
 use propolis::chardev::{pollers, Sink, Source};
 use propolis_api_types::InstanceSerialConsoleControlMessage;
 use slog::{info, warn, Logger};
@@ -78,11 +78,14 @@ pub struct SerialTask {
     /// clients of a migration
     pub control_ch: mpsc::Sender<SerialTaskControlMessage>,
     /// Channel used to send new client connections to the streaming task
-    pub websocks_ch: mpsc::Sender<WebSocketStream<Upgraded>>,
+    pub websocks_ch:
+        mpsc::Sender<WebSocketStream<dropshot::WebsocketConnectionRaw>>,
 }
 
 pub async fn instance_serial_task<Device: Sink + Source>(
-    mut websocks_recv: mpsc::Receiver<WebSocketStream<Upgraded>>,
+    mut websocks_recv: mpsc::Receiver<
+        WebSocketStream<dropshot::WebsocketConnectionRaw>,
+    >,
     mut control_recv: mpsc::Receiver<SerialTaskControlMessage>,
     serial: Arc<Serial<Device>>,
     log: Logger,
@@ -94,11 +97,11 @@ pub async fn instance_serial_task<Device: Sink + Source>(
 
     let mut ws_sinks: HashMap<
         usize,
-        SplitSink<WebSocketStream<Upgraded>, Message>,
+        SplitSink<WebSocketStream<dropshot::WebsocketConnectionRaw>, Message>,
     > = HashMap::new();
     let mut ws_streams: HashMap<
         usize,
-        futures::stream::SplitStream<WebSocketStream<Upgraded>>,
+        futures::stream::SplitStream<WebSocketStream<WebsocketConnectionRaw>>,
     > = HashMap::new();
 
     let (send_ch, mut recv_ch) = mpsc::channel(4);

diff --git a/bin/propolis-server/src/lib/server.rs b/bin/propolis-server/src/lib/server.rs
@@ -258,7 +258,7 @@ async fn instance_ensure_common(
             | VmError::AlreadyInitialized
             | VmError::RundownInProgress => HttpError::for_client_error(
                 Some(api::ErrorCode::AlreadyInitialized.to_string()),
-                http::StatusCode::CONFLICT,
+                hyper::StatusCode::CONFLICT,
                 "instance already initialized".to_string(),
             ),
             VmError::InitializationFailed(e) => HttpError::for_internal_error(
@@ -390,7 +390,7 @@ async fn instance_state_monitor(
         state_watcher.changed().await.map_err(|_| {
             HttpError::for_client_error(
                 Some(api::ErrorCode::NoInstance.to_string()),
-                http::status::StatusCode::GONE,
+                hyper::StatusCode::GONE,
                 format!(
                     "No instance present; will never reach generation {}",
                     gen
@@ -420,7 +420,7 @@ async fn instance_state_put(
             }
             VmError::ForbiddenStateChange(reason) => HttpError::for_status(
                 Some(format!("instance state change not allowed: {}", reason)),
-                http::status::StatusCode::FORBIDDEN,
+                hyper::StatusCode::FORBIDDEN,
             ),
             _ => HttpError::for_internal_error(format!(
                 "unexpected error from VM controller: {e}"
@@ -674,7 +674,7 @@ async fn instance_issue_crucible_vcr_request(
         .map_err(|e| match e {
             VmError::ForbiddenStateChange(reason) => HttpError::for_status(
                 Some(format!("instance state change not allowed: {}", reason)),
-                http::status::StatusCode::FORBIDDEN,
+                hyper::StatusCode::FORBIDDEN,
             ),
             _ => HttpError::for_internal_error(format!(
                 "unexpected error from VM controller: {e}"
@@ -730,7 +730,7 @@ pub fn api() -> ApiDescription<Arc<DropshotEndpointContext>> {
 fn not_created_error() -> HttpError {
     HttpError::for_client_error(
         Some(api::ErrorCode::NoInstance.to_string()),
-        http::StatusCode::FAILED_DEPENDENCY,
+        hyper::StatusCode::FAILED_DEPENDENCY,
         "Server not initialized (no instance)".to_string(),
     )
 }

diff --git a/bin/propolis-server/src/lib/vm/request_queue.rs b/bin/propolis-server/src/lib/vm/request_queue.rs
@@ -433,7 +433,7 @@ impl Drop for ExternalRequestQueue {
                                 "VM destroyed before request could be handled"
                                     .to_string(),
                             ),
-                            http::StatusCode::GONE,
+                            hyper::StatusCode::GONE,
                         )));
                 }
 

diff --git a/phd-tests/framework/Cargo.toml b/phd-tests/framework/Cargo.toml
@@ -20,7 +20,6 @@ fatfs.workspace = true
 futures.workspace = true
 flate2.workspace = true
 hex.workspace = true
-http.workspace = true
 libc.workspace = true
 newtype_derive.workspace = true
 propolis-client.workspace = true

diff --git a/phd-tests/framework/src/test_vm/mod.rs b/phd-tests/framework/src/test_vm/mod.rs
@@ -985,7 +985,7 @@ async fn try_ensure_vm_destroyed(client: &Client) {
         // nothing else that *can* be done, but the error is unusual and should
         // be logged.
         match error.status() {
-            Some(http::status::StatusCode::FAILED_DEPENDENCY) => {}
+            Some(reqwest::StatusCode::FAILED_DEPENDENCY) => {}
             _ => {
                 error!(
                     %error,

diff --git a/phd-tests/tests/Cargo.toml b/phd-tests/tests/Cargo.toml
@@ -12,5 +12,6 @@ futures.workspace = true
 http.workspace = true
 propolis-client.workspace = true
 phd-testcase.workspace = true
+reqwest.workspace = true
 tracing.workspace = true
 uuid.workspace = true
diff --git a/phd-tests/tests/src/server_state_machine.rs b/phd-tests/tests/src/server_state_machine.rs
@@ -37,15 +37,15 @@ async fn instance_stop_causes_destroy_test(ctx: &Framework) {
 
     assert!(matches!(
         vm.run().await.unwrap_err().status().unwrap(),
-        http::status::StatusCode::FAILED_DEPENDENCY
+        reqwest::StatusCode::FAILED_DEPENDENCY
     ));
     assert!(matches!(
         vm.stop().await.unwrap_err().status().unwrap(),
-        http::status::StatusCode::FAILED_DEPENDENCY
+        reqwest::StatusCode::FAILED_DEPENDENCY
     ));
     assert!(matches!(
         vm.reset().await.unwrap_err().status().unwrap(),
-        http::status::StatusCode::FAILED_DEPENDENCY
+        reqwest::StatusCode::FAILED_DEPENDENCY
     ));
 }