Skip to content

Commit

Permalink
Fix bench driver panic (MystenLabs#7014)
Browse files Browse the repository at this point in the history
cardinality needs to be consistent
  • Loading branch information
lxfind authored Dec 23, 2022
1 parent 7d0f25b commit e425af0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
4 changes: 2 additions & 2 deletions crates/sui-benchmark/src/drivers/bench_driver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const LATENCY_SEC_BUCKETS: &[f64] = &[
0.01, 0.05, 0.1, 0.25, 0.5, 1., 2.5, 5., 10., 20., 30., 60., 90.,
];

const RECONFIG_QUIESCENCE_TIME_SEC: u64 = 10;
const RECONFIG_QUIESCENCE_TIME_SEC: u64 = 5;

impl BenchMetrics {
fn new(registry: &Registry) -> Self {
Expand Down Expand Up @@ -413,7 +413,7 @@ impl Driver<BenchmarkStats> for BenchDriver {
proxy_clone.reconfig().await;
} else {
error!("Retry due to error: {}", err);
metrics_cloned.num_error.with_label_values(&[&payload.get_workload_type().to_string(), err.as_ref()]).inc();
metrics_cloned.num_error.with_label_values(&[&payload.get_workload_type().to_string()]).inc();
}
NextOp::Retry(Box::new((tx, payload)))
}
Expand Down
5 changes: 1 addition & 4 deletions crates/sui-types/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -606,10 +606,7 @@ impl SuiError {
match self {
SuiError::QuorumFailedToProcessTransaction { errors, .. }
| SuiError::QuorumFailedToExecuteCertificate { errors, .. } => {
errors.iter().any(|err| {
matches!(err, SuiError::ValidatorHaltedAtEpochEnd)
|| matches!(self, SuiError::MissingCommitteeAtEpoch(_))
})
errors.iter().any(|err| err.indicates_epoch_change())
}
SuiError::ValidatorHaltedAtEpochEnd | SuiError::MissingCommitteeAtEpoch(_) => true,
_ => false,
Expand Down

0 comments on commit e425af0

Please sign in to comment.