diff --git a/ci/run-sanity.sh b/ci/run-sanity.sh index 36f423c53e4b3c..50d73dd5e9155c 100755 --- a/ci/run-sanity.sh +++ b/ci/run-sanity.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -e +set -ex cd "$(dirname "$0")/.." # shellcheck source=multinode-demo/common.sh @@ -29,6 +29,8 @@ curl -X POST -H 'Content-Type: application/json' -d '{"jsonrpc":"2.0","id":1, "m wait $pid -$solana_ledger_tool create-snapshot --ledger config/ledger "$snapshot_slot" config/snapshot-ledger +$solana_ledger_tool create-snapshot --ledger config/ledger "$snapshot_slot" config/snapshot-ledger 2>&1 \ + | tee -a "ledger-tool.log" cp config/ledger/genesis.tar.bz2 config/snapshot-ledger -$solana_ledger_tool verify --ledger config/snapshot-ledger +$solana_ledger_tool verify --ledger config/snapshot-ledger 2>&1 | tee -a "ledger-tool.log" +! grep "failed to match hash" "ledger-tool.log" diff --git a/programs/vote/src/vote_state/mod.rs b/programs/vote/src/vote_state/mod.rs index 9b61d847279c52..9a2dcbc183eeac 100644 --- a/programs/vote/src/vote_state/mod.rs +++ b/programs/vote/src/vote_state/mod.rs @@ -323,8 +323,9 @@ impl VoteState { return Err(VoteError::SlotsMismatch); } if slot_hashes[j].1 != vote.hash { + // UPDATE ci/run-sanity.sh AS WELL WHEN CHANGING THIS LOG FORMAT! warn!( - "{} dropped vote {:?} failed to match hash {} {}", + "{} dropped vote {:?} failed to match hash: {} (vote's) != {} (local's)", self.node_pubkey, vote, vote.hash, slot_hashes[j].1 ); inc_new_counter_info!("dropped-vote-hash", 1);