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

Move Nexus notification to standalone task #1584

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Move Nexus notification to standalone task #1584

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce60ff2
Working on standalone notify task
mkeeter Dec 3, 2024
6e9e9b2
Everything compiles
mkeeter Dec 5, 2024
f9d0625
Fix startup, remove unused deps
mkeeter Dec 5, 2024
d81f7fe
Small updates per review
mkeeter Dec 11, 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
2 changes: 0 additions & 2 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.

1 change: 0 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ openapi-lint = { git = "https://github.com/oxidecomputer/openapi-lint", branch =
oximeter = { git = "https://github.com/oxidecomputer/omicron", branch = "main" }
oximeter-producer = { git = "https://github.com/oxidecomputer/omicron", branch = "main" }
progenitor = "0.8.0"
progenitor-client = "0.8.0"

# local path
crucible = { path = "./upstairs" }
Expand Down
10 changes: 4 additions & 6 deletions upstairs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ path = "src/lib.rs"

[features]
asm = ["usdt/asm"]
notify-nexus = ["nexus-client", "internal-dns", "progenitor-client", "http", "omicron-uuid-kinds"]
notify-nexus = []
integration-tests = []

[dependencies]
Expand Down Expand Up @@ -56,11 +56,9 @@ aes-gcm-siv.workspace = true
rand_chacha.workspace = true
reqwest.workspace = true
crucible-workspace-hack.workspace = true
nexus-client = { workspace = true, optional = true }
internal-dns = { workspace = true, optional = true }
omicron-uuid-kinds = { workspace = true, optional = true }
progenitor-client = { workspace = true, optional = true }
http = { workspace = true, optional = true }
nexus-client.workspace = true
omicron-uuid-kinds.workspace = true
internal-dns.workspace = true

[dev-dependencies]
expectorate.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion upstairs/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2090,7 +2090,7 @@ impl DownstairsClient {
self.client_delay_us.load(Ordering::Relaxed)
}

#[cfg(feature = "notify-nexus")]
/// Looks up the region UUID
pub(crate) fn id(&self) -> Option<Uuid> {
self.region_uuid
}
Expand Down
Loading
Loading