GRIN/grin-node
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: always put txhashset.write before store.batch to avoid dead lock (#1699)

Browse Source 
* fix: to avoid dead lock, always put txhashset.write before store.batch

* fix: move txhashset.write behind store.batch
This commit is contained in:
Gary Yu
2018-10-09 20:38:36 +08:00
committed by GitHub
parent 23180d6f86
commit 7e7697bf4b
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chain/src/chain.rs
+14 -14
View File
@@ -219,8 +219,8 @@ impl Chain {
fn process_block_single(&self, b: Block, opts: Options) -> Result<Option<Tip>, Error> {
let maybe_new_head: Result<Option<Tip>, Error>;
{
let batch = self.store.batch()?;
let mut txhashset = self.txhashset.write().unwrap();
let batch = self.store.batch()?;
let mut ctx = self.new_ctx(opts, batch, &mut txhashset)?;
maybe_new_head = pipe::process_block(&b, &mut ctx);
@@ -299,8 +299,8 @@ impl Chain {
/// Process a block header received during "header first" propagation.
pub fn process_block_header(&self, bh: &BlockHeader, opts: Options) -> Result<(), Error> {
let batch = self.store.batch()?;
let mut txhashset = self.txhashset.write().unwrap();
let batch = self.store.batch()?;
let mut ctx = self.new_ctx(opts, batch, &mut txhashset)?;
pipe::process_block_header(bh, &mut ctx)?;
ctx.batch.commit()?;
@@ -315,8 +315,8 @@ impl Chain {
headers: &Vec<BlockHeader>,
opts: Options,
) -> Result<(), Error> {
let batch = self.store.batch()?;
let mut txhashset = self.txhashset.write().unwrap();
let batch = self.store.batch()?;
let mut ctx = self.new_ctx(opts, batch, &mut txhashset)?;
pipe::sync_block_headers(headers, &mut ctx)?;
@@ -666,17 +666,6 @@ impl Chain {
status.on_save();
// Replace the chain txhashset with the newly built one.
{
let mut txhashset_ref = self.txhashset.write().unwrap();
*txhashset_ref = txhashset;
}
debug!(
LOGGER,
"chain: txhashset_write: replaced our txhashset with the new one"
);
// Save the new head to the db and rebuild the header by height index.
{
let tip = Tip::from_block(&header);
@@ -693,6 +682,17 @@ impl Chain {
"chain: txhashset_write: finished committing the batch (head etc.)"
);
// Replace the chain txhashset with the newly built one.
{
let mut txhashset_ref = self.txhashset.write().unwrap();
*txhashset_ref = txhashset;
}
debug!(
LOGGER,
"chain: txhashset_write: replaced our txhashset with the new one"
);
// Check for any orphan blocks and process them based on the new chain state.
self.check_orphans(header.height + 1);