adjusting thresholds

aptos-labs · Jan 8, 2025 · 9c5d9a1 · 9c5d9a1
1 parent 4cc7fe1
commit 9c5d9a1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/testsuite/forge-cli/src/suites/realistic_environment.rs b/testsuite/forge-cli/src/suites/realistic_environment.rs
@@ -179,7 +179,7 @@ pub(crate) fn realistic_env_fairness_workload_sweep() -> ForgeConfig {
         ]),
         criteria: Vec::new(),
         background_traffic: background_traffic_for_sweep_with_latency(
-            &[(3.0, 8.0), (3.0, 8.0), (3.0, 4.0)],
+            &[(2.0, 3.0, 8.0), (0.1, 25.0, 30.0), (0.1, 30.0, 40.0)],
             false,
         ),
     })
@@ -213,14 +213,14 @@ pub(crate) fn realistic_env_graceful_workload_sweep() -> ForgeConfig {
         criteria: Vec::new(),
         background_traffic: background_traffic_for_sweep_with_latency(
             &[
-                (4.0, 5.0),
-                (2.2, 3.0),
-                (3.5, 5.0),
-                (4.0, 6.0),
-                (2.5, 4.0),
-                (3.5, 5.0),
+                (0.1, 4.0, 5.0),
+                (0.1, 2.2, 3.0),
+                (0.1, 3.5, 5.0),
+                (0.1, 4.0, 6.0),
+                (0.1, 2.5, 4.0),
+                (0.1, 3.5, 5.0),
                 // TODO - p50 and p90 is set to high, until it is calibrated/understood.
-                (3.0, 10.0),
+                (0.1, 3.0, 10.0),
             ],
             true,
         ),

diff --git a/testsuite/forge-cli/src/suites/ungrouped.rs b/testsuite/forge-cli/src/suites/ungrouped.rs
@@ -428,16 +428,16 @@ pub fn background_traffic_for_sweep(num_cases: usize) -> Option<BackgroundTraffi
 }
 
 pub fn background_traffic_for_sweep_with_latency(
-    criteria: &[(f32, f32)],
+    criteria_expired_p50_and_p90: &[(f64, f32, f32)],
     high_gas_price: bool,
 ) -> Option<BackgroundTraffic> {
     Some(BackgroundTraffic {
         traffic: background_emit_request(high_gas_price),
-        criteria: criteria
+        criteria: criteria_expired_p50_and_p90
             .iter()
-            .map(|(p50, p90)| {
+            .map(|(expired, p50, p90)| {
                 SuccessCriteria::new_float(9.5)
-                    .add_max_expired_tps(0.1)
+                    .add_max_expired_tps(*expired)
                     .add_max_failed_submission_tps(0.0)
                     .add_latency_threshold(*p50, LatencyType::P50)
                     .add_latency_threshold(*p90, LatencyType::P90)