Merge pull request DMDcoin#225 from SurfingNerd/release-prep-0.11.1

Release prep 0.11.1

Author: SurfingNerd

CHANGELOG.md

@@ -1,4 +1,7 @@
 
+## Diamond Node Software 3.3.5-hbbft-0.11.1
+
+- caching of SyncStatus to prevent deadlocks https://github.com/DMDcoin/diamond-node/issues/223
 
 ## Diamond Node Software 3.3.5-hbbft-0.11.0
 

Cargo.lock

@@ -2,7 +2,7 @@
 description = "Diamond Node"
 name = "diamond-node"
 # NOTE Make sure to update util/version/Cargo.toml as well
-version = "3.3.5-hbbft-0.11.0-rc3"
+version = "3.3.5-hbbft-0.11.1"
 license = "GPL-3.0"
 authors = [
 	"bit.diamonds developers",

Cargo.toml

@@ -428,6 +428,8 @@ pub struct ChainSyncApi {
     priority_tasks: Mutex<mpsc::Receiver<PriorityTask>>,
     /// The rest of sync data
     sync: RwLock<ChainSync>,
+    /// last known sync state.
+    last_known_sync_status: Mutex<SyncStatus>,
 }
 
 impl ChainSyncApi {
@@ -439,14 +441,14 @@ impl ChainSyncApi {
         priority_tasks: mpsc::Receiver<PriorityTask>,
         new_transaction_hashes: crossbeam_channel::Receiver<H256>,
     ) -> Self {
+        let sync = ChainSync::new(config, chain, fork_filter, new_transaction_hashes);
+
+        let last_known_sync_status = sync.status();
+
         ChainSyncApi {
-            sync: RwLock::new(ChainSync::new(
-                config,
-                chain,
-                fork_filter,
-                new_transaction_hashes,
-            )),
+            sync: RwLock::new(sync),
             priority_tasks: Mutex::new(priority_tasks),
+            last_known_sync_status: Mutex::new(last_known_sync_status),
         }
     }
 
@@ -461,9 +463,17 @@ impl ChainSyncApi {
         ids.iter().map(|id| sync.peer_info(id)).collect()
     }
 
-    /// Returns synchonization status
+    /// Returns best known synchonization status
     pub fn status(&self) -> SyncStatus {
-        self.sync.read().status()
+        if let Some(sync) = self.sync.try_read_for(Duration::from_millis(50)) {
+            let status = sync.status();
+            *self.last_known_sync_status.lock() = status.clone();
+            return status;
+        }
+
+        // we return that last known sync status here, in cases we could not get the most recent information.
+        // see also: https://github.com/DMDcoin/diamond-node/issues/223
+        return self.last_known_sync_status.lock().clone();
     }
 
     /// Returns pending transactions propagation statistics

crates/ethcore/sync/src/chain/mod.rs

@@ -1,7 +1,7 @@
 [package]
 name = "parity-version"
 # NOTE: this value is used for OpenEthereum version string (via env CARGO_PKG_VERSION)
-version = "3.3.5-hbbft-0.11.0-rc3"
+version = "3.3.5-hbbft-0.11.1"
 authors = [
 	"bit.diamonds developers",
 	"OpenEthereum developers",