From b689338953efacb4f91191336e5c4bc7587a0791 Mon Sep 17 00:00:00 2001 From: Matthew Plant Date: Wed, 12 Apr 2023 17:29:52 -0400 Subject: [PATCH 1/2] Manually commit heartbeats and speedtests --- mobile_verifier/src/cli/server.rs | 2 ++ mobile_verifier/src/verifier.rs | 3 +++ 2 files changed, 5 insertions(+) diff --git a/mobile_verifier/src/cli/server.rs b/mobile_verifier/src/cli/server.rs index 37dd8a039..ddf3b2143 100644 --- a/mobile_verifier/src/cli/server.rs +++ b/mobile_verifier/src/cli/server.rs @@ -41,6 +41,7 @@ impl Cmd { concat!(env!("CARGO_PKG_NAME"), "_heartbeat"), ) .deposits(Some(file_upload_tx.clone())) + .auto_commit(false) .roll_time(Duration::minutes(15)) .create() .await?; @@ -52,6 +53,7 @@ impl Cmd { concat!(env!("CARGO_PKG_NAME"), "_speedtest_average"), ) .deposits(Some(file_upload_tx.clone())) + .auto_commit(false) .roll_time(Duration::minutes(15)) .create() .await?; diff --git a/mobile_verifier/src/verifier.rs b/mobile_verifier/src/verifier.rs index c39b3ee66..4fc20b8a2 100644 --- a/mobile_verifier/src/verifier.rs +++ b/mobile_verifier/src/verifier.rs @@ -102,6 +102,9 @@ impl VerifierDaemon { speedtest.save(&mut transaction).await?; } + let _ = self.heartbeats.commit().await?.await??; + let _ = self.speedtest_avgs.commit().await?.await??; + save_last_verified_end_time(&mut transaction, &scheduler.verification_period.end).await?; transaction.commit().await?; From 115444ebc8df3a775da88f309f7f5ac80d9d62f9 Mon Sep 17 00:00:00 2001 From: Matthew Plant Date: Thu, 13 Apr 2023 13:22:12 -0400 Subject: [PATCH 2/2] move dcommits to after the save last verified end time --- mobile_verifier/src/verifier.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mobile_verifier/src/verifier.rs b/mobile_verifier/src/verifier.rs index 4fc20b8a2..fdced2ef9 100644 --- a/mobile_verifier/src/verifier.rs +++ b/mobile_verifier/src/verifier.rs @@ -102,10 +102,9 @@ impl VerifierDaemon { speedtest.save(&mut transaction).await?; } + save_last_verified_end_time(&mut transaction, &scheduler.verification_period.end).await?; let _ = self.heartbeats.commit().await?.await??; let _ = self.speedtest_avgs.commit().await?.await??; - - save_last_verified_end_time(&mut transaction, &scheduler.verification_period.end).await?; transaction.commit().await?; Ok(())