From 023c133d88bd929290a193f79312acfe584371b0 Mon Sep 17 00:00:00 2001 From: Brian Balser Date: Thu, 27 Feb 2025 08:21:05 -0500 Subject: [PATCH 1/4] Add some logging when cbrs events after the cbrs disable time are dropped --- .idea/.gitignore | 6 ++++++ ingest/src/server_mobile.rs | 18 ++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 .idea/.gitignore diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 000000000..8bf4d45d6 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,6 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/ingest/src/server_mobile.rs b/ingest/src/server_mobile.rs index 1f2c8928e..68b54664c 100644 --- a/ingest/src/server_mobile.rs +++ b/ingest/src/server_mobile.rs @@ -222,15 +222,19 @@ where request: Request, ) -> GrpcResult { let timestamp = Utc::now(); + let event = request.into_inner(); if timestamp >= self.cbrs_disable_time { + let pubkey = PublicKeyBinary::from(event.pub_key); + tracing::info!( + ?pubkey, + "dropping CellHeartbeatReqV1 because cbrs disable time as passed" + ); return Ok(Response::new(CellHeartbeatRespV1 { id: timestamp.to_string(), })); } - let event = request.into_inner(); - custom_tracing::record_b58("pub_key", &event.pub_key); let report = self @@ -280,6 +284,16 @@ where let event = request.into_inner(); if is_data_transfer_for_cbrs(&event) && timestamp > self.cbrs_disable_time { + let pubkey = event + .data_transfer_usage + .map(|usage| PublicKeyBinary::from(usage.pub_key)) + .ok_or_else(|| anyhow::anyhow!("No pubkey available")); + + tracing::info!( + ?pubkey, + "dropping DataTransferSessionReqV1 because cbrs disable time as passed" + ); + return Ok(Response::new(DataTransferSessionRespV1 { id: timestamp.to_string(), })); From 918f7e99166b0eb9f5ed261bf1b08918b0efc211 Mon Sep 17 00:00:00 2001 From: Brian Balser Date: Thu, 27 Feb 2025 08:55:28 -0500 Subject: [PATCH 2/4] remove .idea subdir --- .idea/.gitignore | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 .idea/.gitignore diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 8bf4d45d6..000000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml From 2c459ff4bc866482ecc7396f6bde574b4a21a15d Mon Sep 17 00:00:00 2001 From: Brian Balser Date: Thu, 27 Feb 2025 12:35:54 -0500 Subject: [PATCH 3/4] Update ingest/src/server_mobile.rs Co-authored-by: Jeff Grunewald --- ingest/src/server_mobile.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ingest/src/server_mobile.rs b/ingest/src/server_mobile.rs index 68b54664c..78c32fc31 100644 --- a/ingest/src/server_mobile.rs +++ b/ingest/src/server_mobile.rs @@ -228,7 +228,7 @@ where let pubkey = PublicKeyBinary::from(event.pub_key); tracing::info!( ?pubkey, - "dropping CellHeartbeatReqV1 because cbrs disable time as passed" + "dropping CellHeartbeatReqV1 because cbrs disable time has passed" ); return Ok(Response::new(CellHeartbeatRespV1 { id: timestamp.to_string(), From f9c2fdcad1133ab7c7950167c20b1ce3bba19c1c Mon Sep 17 00:00:00 2001 From: Brian Balser Date: Thu, 27 Feb 2025 12:37:18 -0500 Subject: [PATCH 4/4] fix typo --- ingest/src/server_mobile.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ingest/src/server_mobile.rs b/ingest/src/server_mobile.rs index 78c32fc31..db1278a50 100644 --- a/ingest/src/server_mobile.rs +++ b/ingest/src/server_mobile.rs @@ -291,7 +291,7 @@ where tracing::info!( ?pubkey, - "dropping DataTransferSessionReqV1 because cbrs disable time as passed" + "dropping DataTransferSessionReqV1 because cbrs disable time has passed" ); return Ok(Response::new(DataTransferSessionRespV1 {