zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Workaround lightwalletd hangs by waiting until we're near the tip or timeout (#4763)

This commit is contained in:
teor 2022-07-08 13:03:07 +10:00 committed by GitHub
parent a55262c3ac
commit c4f89ed2e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
zebrad/tests/acceptance.rs
View File

@ -1421,11 +1421,29 @@ fn lightwalletd_integration_test(test_type: LightwalletdTestType) -> Result<()>
lightwalletd lightwalletd
.expect_stdout_line_matches("([Aa]dding block to cache)|([Ww]aiting for block)")?; .expect_stdout_line_matches("([Aa]dding block to cache)|([Ww]aiting for block)")?;
// Wait for lightwalletd to sync to Zebra's tip // Wait for lightwalletd to sync to Zebra's tip.
// //
// TODO: re-enable this code when lightwalletd hangs are fixed // TODO: after the lightwalletd hangs are fixed, fail the test on errors or timeouts
#[cfg(lightwalletd_hang_fix)] if cfg!(lightwalletd_hang_fix) {
lightwalletd.expect_stdout_line_matches("[Ww]aiting for block")?; lightwalletd.expect_stdout_line_matches("[Ww]aiting for block")?;
} else {
// To work around a hang bug, we run the test until:
// - lightwalletd starts waiting for blocks (best case scenario)
// - lightwalletd syncs to near the tip (workaround, cached state image is usable)
// - the test times out with an error, but we ignore it
// (workaround, cached state might be usable, slow, or might fail other tests)
//
// TODO: update the regex to `1[8-9][0-9]{5}` when mainnet reaches block 1_800_000
let log_result = lightwalletd.expect_stdout_line_matches(
"([Aa]dding block to cache 1[7-9][0-9]{5})|([Ww]aiting for block)",
);
if log_result.is_err() {
tracing::warn!(
?log_result,
"ignoring a lightwalletd test failure, to work around a lightwalletd hang bug",
);
}
}
// Check Zebra is still at the tip (also clears and prints Zebra's logs) // Check Zebra is still at the tip (also clears and prints Zebra's logs)
zebrad.expect_stdout_line_matches(SYNC_FINISHED_REGEX)?; zebrad.expect_stdout_line_matches(SYNC_FINISHED_REGEX)?;
@ -1436,8 +1454,7 @@ fn lightwalletd_integration_test(test_type: LightwalletdTestType) -> Result<()>
// adityapk00/lightwalletd logs mempool changes, but zcash/lightwalletd doesn't. // adityapk00/lightwalletd logs mempool changes, but zcash/lightwalletd doesn't.
// //
// TODO: re-enable this code when lightwalletd hangs are fixed // TODO: re-enable this code when lightwalletd hangs are fixed
#[cfg(lightwalletd_hang_fix)] if cfg!(lightwalletd_hang_fix) {
{
lightwalletd.expect_stdout_line_matches(regex::escape( lightwalletd.expect_stdout_line_matches(regex::escape(
"Block hash changed, clearing mempool clients", "Block hash changed, clearing mempool clients",
))?; ))?;