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

[Merged by Bors] - feat: Retry monitoring if there is a failure #2975

Closed
wants to merge 3 commits into from
Closed

[Merged by Bors] - feat: Retry monitoring if there is a failure #2975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
392df90
Feat: recreate monitoring loop if there is a socket issue
morenol Feb 9, 2023
e38815f
retry in 5 seconds
morenol Feb 9, 2023
f0b095c
Also in connectors
morenol Feb 9, 2023
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
46 changes: 27 additions & 19 deletions crates/fluvio-connector-common/src/monitoring.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,29 +44,37 @@ async fn start_monitoring(metrics: Arc<ConnectorMetrics>) -> Result<(), IoError>
}
};

// check if file exists
if let Ok(_metadata) = std::fs::metadata(&metric_out_path) {
info!("metric file already exists, deleting: {}", metric_out_path);
match std::fs::remove_file(&metric_out_path) {
Ok(_) => {}
Err(err) => {
println!("error deleting metric file: {err}");
return Err(err);
loop {
morenol marked this conversation as resolved.
Show resolved Hide resolved
// check if file exists
if let Ok(_metadata) = std::fs::metadata(&metric_out_path) {
info!("metric file already exists, deleting: {}", metric_out_path);
match std::fs::remove_file(&metric_out_path) {
Ok(_) => {}
Err(err) => {
println!("error deleting metric file: {err}");
return Err(err);
}
}
}
}

let listener = UnixListener::bind(metric_out_path)?;
let mut incoming = listener.incoming();
info!("monitoring started");
let listener = UnixListener::bind(&metric_out_path)?;
let mut incoming = listener.incoming();
info!("monitoring started");

while let Some(stream) = incoming.next().await {
let mut stream = stream?;
while let Some(stream) = incoming.next().await {
let mut stream = match stream {
Ok(stream) => stream,
Err(err) => {
error!("error accepting connection: {}", err);
break;
}
};

trace!("metrics: {:?}", metrics);
let bytes = serde_json::to_vec_pretty(metrics.as_ref())?;
stream.write_all(&bytes).await?;
trace!("metrics: {:?}", metrics);
let bytes = serde_json::to_vec_pretty(metrics.as_ref())?;
stream.write_all(&bytes).await?;
}
info!("monitoring socket closed. Trying to reconnect in 5 seconds");
fluvio_future::timer::sleep(std::time::Duration::from_secs(5)).await;
}

Ok(())
}
48 changes: 28 additions & 20 deletions crates/fluvio-spu/src/monitoring.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,30 +30,38 @@ async fn start_monitoring(ctx: DefaultSharedGlobalContext) -> Result<(), IoError
}
};

// check if file exists
if let Ok(_metadata) = std::fs::metadata(&metric_out_path) {
debug!("metric file already exists, deleting: {}", metric_out_path);
match std::fs::remove_file(&metric_out_path) {
Ok(_) => {}
Err(err) => {
error!("error deleting metric file: {}", err);
return Err(err);
loop {
// check if file exists
if let Ok(_metadata) = std::fs::metadata(&metric_out_path) {
debug!("metric file already exists, deleting: {}", metric_out_path);
match std::fs::remove_file(&metric_out_path) {
Ok(_) => {}
Err(err) => {
error!("error deleting metric file: {}", err);
return Err(err);
}
}
}
}

let listener = UnixListener::bind(metric_out_path)?;
let mut incoming = listener.incoming();
info!("monitoring started");
let listener = UnixListener::bind(&metric_out_path)?;
let mut incoming = listener.incoming();
info!("monitoring started");

let metrics: &SpuMetrics = &ctx.metrics();
while let Some(stream) = incoming.next().await {
let mut stream = stream?;
let metrics: &SpuMetrics = &ctx.metrics();
while let Some(stream) = incoming.next().await {
let mut stream = match stream {
Ok(stream) => stream,
Err(err) => {
error!("error accepting connection: {}", err);
break;
}
};

// println!("metrics: {:?}", metrics);
let bytes = serde_json::to_vec_pretty(metrics)?;
stream.write_all(&bytes).await?;
}
let bytes = serde_json::to_vec_pretty(metrics)?;
stream.write_all(&bytes).await?;
}

Ok(())
info!("monitoring socket closed. Trying to reconnect in 5 seconds");
fluvio_future::timer::sleep(std::time::Duration::from_secs(5)).await;
}
}