david/nostr-rs-relay
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improvement: provide reason for abort in prometheus metric

Browse Source
This commit is contained in:
Greg Heartsfield
2023-01-30 18:40:47 -06:00
parent 3fcaf97a15
commit 214f152c5d
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/repo/postgres.rs
+1 -1
View File
@@ -358,7 +358,7 @@ ON CONFLICT (id) DO NOTHING"#,
if last_successful_send + abort_cutoff < Instant::now() {
// the queue has been full for too long, abort
info!("aborting database query due to slow client");
metrics.query_aborts.inc();
metrics.query_aborts.with_label_values(&["slowclient"]).inc();
return Ok(());
}
// give the queue a chance to clear before trying again
src/repo/sqlite.rs
+4 -3
View File
@@ -323,6 +323,7 @@ impl NostrRepo for SqliteRepo {
"shedding DB query load queued for {:?} (cid: {}, sub: {:?})",
db_queue_time, client_id, sub.id
);
metrics.query_aborts.with_label_values(&["loadshed"]).inc();
return Ok(());
}
// otherwise, report queuing time if it is slow
@@ -383,7 +384,7 @@ impl NostrRepo for SqliteRepo {
if self.checkpoint_in_progress.try_lock().is_err() {
// lock was held, abort this query
debug!("query aborted due to checkpoint (cid: {}, sub: {:?})", client_id, sub.id);
metrics.query_aborts.inc();
metrics.query_aborts.with_label_values(&["checkpoint"]).inc();
return Ok(());
}
}
@@ -407,7 +408,7 @@ impl NostrRepo for SqliteRepo {
// the queue has been full for too long, abort
info!("aborting database query due to slow client (cid: {}, sub: {:?})",
client_id, sub.id);
metrics.query_aborts.inc();
metrics.query_aborts.with_label_values(&["slowclient"]).inc();
let ok: Result<()> = Ok(());
return ok;
}
@@ -415,7 +416,7 @@ impl NostrRepo for SqliteRepo {
if self.checkpoint_in_progress.try_lock().is_err() {
// lock was held, abort this query
debug!("query aborted due to checkpoint (cid: {}, sub: {:?})", client_id, sub.id);
metrics.query_aborts.inc();
metrics.query_aborts.with_label_values(&["checkpoint"]).inc();
return Ok(());
}
// give the queue a chance to clear before trying again