Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-01-21 03:21:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix for deadlock issue (#3700)

Browse source
This commit is contained in:
Yeastplume 2022-03-09 16:07:50 +00:00 committed by GitHub
parent b08a6dd528
commit 09d6f41c09
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
chain/src/txhashset/desegmenter.rs
View file

@ -29,7 +29,6 @@ use crate::types::{Tip, TxHashsetWriteStatus};
use crate::util::secp::pedersen::RangeProof; use crate::util::secp::pedersen::RangeProof;
use crate::util::{RwLock, StopState}; use crate::util::{RwLock, StopState};
use crate::SyncState; use crate::SyncState;
use std::{thread, time};
use crate::store; use crate::store;
use crate::txhashset; use crate::txhashset;
@ -262,19 +261,8 @@ impl Desegmenter {
// Check NRD relative height rules for full kernel history. // Check NRD relative height rules for full kernel history.
{ {
let header_pmmr = self.header_pmmr.read();
let txhashset = self.txhashset.read(); let txhashset = self.txhashset.read();
// TODO: This appears to be locked by something else indefinitely, but only sometimes
// should not be the case, figure out why
let header_pmmr =
{
let mut res = self.header_pmmr.try_read();
while res.is_none() {
error!("Header PMMR is thread locked somewhere (this should not be the case)!!!");
thread::sleep(time::Duration::from_secs(1));
res = self.header_pmmr.try_read();
}
res.unwrap()
};
let batch = self.store.batch()?; let batch = self.store.batch()?;
txhashset.verify_kernel_pos_index( txhashset.verify_kernel_pos_index(
&self.genesis, &self.genesis,
@ -293,8 +281,8 @@ impl Desegmenter {
// Prepare a new batch and update all the required records // Prepare a new batch and update all the required records
{ {
debug!("desegmenter validation: rewinding a 2nd time (writeable)"); debug!("desegmenter validation: rewinding a 2nd time (writeable)");
let mut txhashset = self.txhashset.write();
let mut header_pmmr = self.header_pmmr.write(); let mut header_pmmr = self.header_pmmr.write();
let mut txhashset = self.txhashset.write();
let mut batch = self.store.batch()?; let mut batch = self.store.batch()?;
txhashset::extending( txhashset::extending(
&mut header_pmmr, &mut header_pmmr,