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

Jump to bottom

feat(eventing): add target volumeid to nvme path events #791

Merged
merged 1 commit into from
Apr 2, 2024
Merged

feat(eventing): add target volumeid to nvme path events #791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion control-plane/agents/src/bin/ha/node/detector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,10 +395,11 @@ impl Event for PathRecord {
fn event(&self, action: EventAction) -> EventMessage {
let event_source = EventSource::new(self.reporter.node_name().to_string())
.with_nvme_path_data(&self.nqn, &self.path);
let volume_id = self.nqn.split(':').last().unwrap_or("").to_string();
EventMessage {
category: EventCategory::NvmePath as i32,
action: action as i32,
target: "".to_string(),
target: volume_id,
metadata: Some(EventMeta::from_source(event_source)),
}
}
Expand Down
18 changes: 11 additions & 7 deletions control-plane/agents/src/bin/ha/node/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ use crate::{
path_provider::get_nvme_path_entry,
Cli,
};
use agents::{
errors::{SvcError, SvcError::SubsystemNotFound},
eventing::EventWithMeta,
};
use agents::errors::{SvcError, SvcError::SubsystemNotFound};
use events_api::event::{EventAction, EventCategory, EventMessage, EventMeta, EventSource};
use grpc::{
common::MapWrapper,
Expand Down Expand Up @@ -243,7 +240,7 @@ impl NodeAgentSvc {
}
"live" => {
tracing::info!(new_path, "New NVMe path is ready to serve I/O");
self.event(EventAction::NvmePathFix, event_meta(&nqn, &new_path))
self.event(EventAction::NvmePathFix, &nqn, event_meta(&nqn, &new_path))
.generate();
break;
}
Expand Down Expand Up @@ -430,12 +427,19 @@ impl ParsedUri {
}
}

/// Event trait definition for creating events and adding meta data for NvmePath events.
trait EventWithMeta {
/// Create event message with meta data.
fn event(&self, action: EventAction, nqn: &str, meta: EventMeta) -> EventMessage;
}

impl EventWithMeta for NodeAgentSvc {
fn event(&self, event_action: EventAction, meta: EventMeta) -> EventMessage {
fn event(&self, event_action: EventAction, nqn: &str, meta: EventMeta) -> EventMessage {
let volume_id = nqn.split(':').last().unwrap_or_default().to_string();
EventMessage {
category: EventCategory::NvmePath as i32,
action: event_action as i32,
target: "".to_string(),
target: volume_id,
metadata: Some(meta),
}
}
Expand Down
Loading