Skip to content

Commit

Permalink
Bump crucible rev to latest (oxidecomputer#452)
Browse files Browse the repository at this point in the history
Pick up the following PRs:

- Set open file resource limit to the max
- Update Rust crate ringbuffer to 0.14
- DTrace meet cmon
- Widen assert values to u128 to deal with u64::MAX
- Change size_to_validate from usize to u64
- Turn on live-repair test in CI
- Increase flush_timeout for some tests, collect cores
- Update to latest dropshot

Also ran the following:

    cargo update -p dropshot
  • Loading branch information
jmpesp authored Jun 28, 2023
1 parent bd1b08d commit 21e65f6
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 35 deletions.
85 changes: 54 additions & 31 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ chrono = "0.4.19"
clap = "4.2"
const_format = "0.2"
crossbeam-channel = "0.5"
crucible = { git = "https://github.com/oxidecomputer/crucible", rev = "df7e274edf0a1df287770e9567b27676f3ae4cc5" }
crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "df7e274edf0a1df287770e9567b27676f3ae4cc5" }
crucible = { git = "https://github.com/oxidecomputer/crucible", rev = "ae135d3d9920c1a8f5d7b2ecb9437c43e1176664" }
crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "ae135d3d9920c1a8f5d7b2ecb9437c43e1176664" }
ctrlc = "3.2"
dropshot = { git = "https://github.com/oxidecomputer/dropshot", branch = "main" }
enum-iterator = "1.4.1"
Expand Down
5 changes: 4 additions & 1 deletion bin/propolis-server/src/lib/stats.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
// Copyright 2022 Oxide Computer Company

use anyhow::anyhow;
use dropshot::{ConfigDropshot, ConfigLogging, ConfigLoggingLevel};
use dropshot::{
ConfigDropshot, ConfigLogging, ConfigLoggingLevel, HandlerTaskMode,
};
use omicron_common::api::internal::nexus::ProducerEndpoint;
use oximeter::{
types::{Cumulative, Sample},
Expand Down Expand Up @@ -115,6 +117,7 @@ pub async fn start_oximeter_server(
let dropshot_config = ConfigDropshot {
bind_address: my_address,
request_body_max_bytes: 2048,
default_handler_task_mode: HandlerTaskMode::Detached,
};

let logging_config =
Expand Down
3 changes: 2 additions & 1 deletion bin/propolis-server/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use anyhow::{anyhow, Context};
use clap::Parser;
use dropshot::{ConfigDropshot, HttpServerStarter};
use dropshot::{ConfigDropshot, HandlerTaskMode, HttpServerStarter};
use futures::join;
use propolis::usdt::register_probes;
use slog::info;
Expand Down Expand Up @@ -185,6 +185,7 @@ async fn main() -> anyhow::Result<()> {
let config_dropshot = ConfigDropshot {
bind_address: propolis_addr,
request_body_max_bytes: 1024 * 1024, // 1M for ISO bytes
default_handler_task_mode: HandlerTaskMode::Detached,
};

let log = build_logger();
Expand Down

0 comments on commit 21e65f6

Please sign in to comment.