From 2163d8d597945c93efb7f514feb82ca88cf47cf5 Mon Sep 17 00:00:00 2001 From: arkpar Date: Sat, 6 Feb 2016 00:03:16 +0100 Subject: [PATCH 01/14] Block queue clear now clears everything --- ethcore/src/block_queue.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ethcore/src/block_queue.rs b/ethcore/src/block_queue.rs index 2e3728aee..808982b99 100644 --- a/ethcore/src/block_queue.rs +++ b/ethcore/src/block_queue.rs @@ -205,6 +205,8 @@ impl BlockQueue { let mut verification = self.verification.lock().unwrap(); verification.unverified.clear(); verification.verifying.clear(); + verification.verified.clear(); + self.processing.write().unwrap().clear(); } /// Wait for queue to be empty From f2ed89be46adf21b032550acd4831e8fbe1bfeb0 Mon Sep 17 00:00:00 2001 From: arkpar Date: Fri, 5 Feb 2016 22:54:33 +0100 Subject: [PATCH 02/14] Fixed an issue with forked counters --- util/src/journaldb.rs | 90 ++++++++++++++++++++++++++++++------------- 1 file changed, 64 insertions(+), 26 deletions(-) diff --git a/util/src/journaldb.rs b/util/src/journaldb.rs index 810b06727..2173fdeb6 100644 --- a/util/src/journaldb.rs +++ b/util/src/journaldb.rs @@ -20,7 +20,7 @@ use common::*; use rlp::*; use hashdb::*; use memorydb::*; -use rocksdb::{DB, Writable, WriteBatch, IteratorMode}; +use rocksdb::{DB, Writable, WriteBatch, IteratorMode, DBVector}; #[cfg(test)] use std::env; @@ -105,6 +105,11 @@ impl JournalDB { // for each end_era that we journaled that we are no passing by, // we remove all of its removes assuming it is canonical and all // of its inserts otherwise. + // + // we also keep track of the counters for each key inserted in the journal to handle the following cases: + // key K is removed in block A(N) and re-inserted in block B(N + C) (where C < H). K must not be deleted from the DB. + // key K is added in block A(N) and reverted in block B(N + C) (where C < H). K must be deleted + // key K is added in blocks A(N) and A'(N) and is reverted in block B(N + C ) (where C < H). K must not be deleted // record new commit's details. let batch = WriteBatch::new(); @@ -125,6 +130,7 @@ impl JournalDB { let mut r = RlpStream::new_list(3); let inserts: Vec = self.overlay.keys().iter().filter(|&(_, &c)| c > 0).map(|(key, _)| key.clone()).collect(); + // Increase counter for each insrted key no matter if the block is canonical or not. for i in &inserts { *counters.entry(i.clone()).or_insert(0) += 1; } @@ -139,6 +145,7 @@ impl JournalDB { if let Some((end_era, canon_id)) = end { let mut index = 0usize; let mut last; + let mut canon_data: Option = None; while let Some(rlp_data) = try!(self.backing.get({ let mut r = RlpStream::new_list(2); r.append(&end_era); @@ -146,35 +153,26 @@ impl JournalDB { last = r.drain(); &last })) { - let to_add; - let rlp = Rlp::new(&rlp_data); - { - to_add = rlp.val_at(1); - for i in &to_add { - let delete_counter = { - if let Some(mut cnt) = counters.get_mut(i) { - *cnt -= 1; - *cnt == 0 - } - else { false } - - }; - if delete_counter { - counters.remove(i); - } - } + let canon = { + let rlp = Rlp::new(&rlp_data); + if canon_id != rlp.val_at(0) { + let to_add: Vec = rlp.val_at(1); + JournalDB::apply_removes(&to_add, &to_add, &mut counters, &batch); + false + } else { true } + }; + if canon { + canon_data = Some(rlp_data) } - let to_remove: Vec = if canon_id == rlp.val_at(0) {rlp.val_at(2)} else {to_add}; - for i in &to_remove { - if !counters.contains_key(i) { - batch.delete(&i).expect("Low-level database error. Some issue with your hard disk?"); - } - } - try!(batch.delete(&last)); - trace!("JournalDB: delete journal for time #{}.{}, (canon was {}): {} entries", end_era, index, canon_id, to_remove.len()); index += 1; } + // Canon must be commited last to handle a case when counter reaches 0 in a sibling block + if let Some(ref c) = canon_data { + let rlp = Rlp::new(&c); + let deleted = JournalDB::apply_removes(&rlp.val_at::>(1), &rlp.val_at::>(2), &mut counters, &batch); + trace!("JournalDB: delete journal for time #{}.{}, (canon was {}): {} entries", end_era, index, canon_id, deleted); + } try!(batch.put(&LAST_ERA_KEY, &encode(&end_era))); } @@ -200,6 +198,29 @@ impl JournalDB { Ok(ret) } + fn apply_removes(added: &[H256], removed: &[H256], counters: &mut HashMap, batch: &WriteBatch) -> usize { + let mut deleted = 0usize; + // Decrease the counters first + for i in added.iter() { + let delete_counter = { + if let Some(mut cnt) = counters.get_mut(i) { + *cnt -= 1; + *cnt == 0 + } + else { false } + }; + if delete_counter { + counters.remove(i); + } + } + // Remove only if counter reached zero + for i in removed.iter().filter(|i| !counters.contains_key(i)) { + batch.delete(&i).expect("Low-level database error. Some issue with your hard disk?"); + deleted += 1; + } + deleted + } + fn payload(&self, key: &H256) -> Option { self.backing.get(&key.bytes()).expect("Low-level database error. Some issue with your hard disk?").map(|v| v.to_vec()) } @@ -387,4 +408,21 @@ mod tests { jdb.commit(3, &b"2".sha3(), Some((0, b"2".sha3()))).unwrap(); assert!(jdb.exists(&foo)); } + + #[test] + fn fork_same_key() { + // history is 1 + let mut jdb = JournalDB::new_temp(); + jdb.commit(0, &b"0".sha3(), None).unwrap(); + + let foo = jdb.insert(b"foo"); + jdb.commit(1, &b"1a".sha3(), Some((0, b"0".sha3()))).unwrap(); + + jdb.insert(b"foo"); + jdb.commit(1, &b"1b".sha3(), Some((0, b"0".sha3()))).unwrap(); + assert!(jdb.exists(&foo)); + + jdb.commit(2, &b"2a".sha3(), Some((1, b"1a".sha3()))).unwrap(); + assert!(jdb.exists(&foo)); + } } From b2f69a08ca1ecc893f86b39ad5d6f4ded3be95c9 Mon Sep 17 00:00:00 2001 From: arkpar Date: Sun, 7 Feb 2016 11:50:56 +0100 Subject: [PATCH 03/14] Clarified counters --- util/src/journaldb.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/util/src/journaldb.rs b/util/src/journaldb.rs index 2173fdeb6..a2b0981cc 100644 --- a/util/src/journaldb.rs +++ b/util/src/journaldb.rs @@ -106,10 +106,12 @@ impl JournalDB { // we remove all of its removes assuming it is canonical and all // of its inserts otherwise. // - // we also keep track of the counters for each key inserted in the journal to handle the following cases: - // key K is removed in block A(N) and re-inserted in block B(N + C) (where C < H). K must not be deleted from the DB. - // key K is added in block A(N) and reverted in block B(N + C) (where C < H). K must be deleted - // key K is added in blocks A(N) and A'(N) and is reverted in block B(N + C ) (where C < H). K must not be deleted + // we also keep track of the counters for each key inserted in the journal to handle + // the following cases where key K must not be deleted from the DB: + // Given H is the journal size in eras, 0 <= C <= H. + // Key K is removed in era A(N) and re-inserted in canonical era B(N + C). + // Key K is removed in era A(N) and re-inserted in non-canonical era B`(N + C). + // Key K is added in canonical era A(N) and non-canonicnal B'(N + C). // record new commit's details. let batch = WriteBatch::new(); From 976b10a4efa3bb4c1d0c3e16714bcd1dc0071a81 Mon Sep 17 00:00:00 2001 From: arkpar Date: Sun, 7 Feb 2016 12:10:28 +0100 Subject: [PATCH 04/14] Removed warning supression --- util/src/journaldb.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/util/src/journaldb.rs b/util/src/journaldb.rs index a2b0981cc..5d3276631 100644 --- a/util/src/journaldb.rs +++ b/util/src/journaldb.rs @@ -92,7 +92,6 @@ impl JournalDB { /// Commit all recent insert operations and historical removals from the old era /// to the backing database. - #[allow(cyclomatic_complexity)] pub fn commit(&mut self, now: u64, id: &H256, end: Option<(u64, H256)>) -> Result { // journal format: // [era, 0] => [ id, [insert_0, ...], [remove_0, ...] ] From 28dd73e340097615cc3f8b75f9fb73354c2bd397 Mon Sep 17 00:00:00 2001 From: arkpar Date: Sun, 7 Feb 2016 18:28:15 +0100 Subject: [PATCH 05/14] Updated counter comment --- util/src/journaldb.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/src/journaldb.rs b/util/src/journaldb.rs index 5d3276631..c13bdee62 100644 --- a/util/src/journaldb.rs +++ b/util/src/journaldb.rs @@ -110,7 +110,7 @@ impl JournalDB { // Given H is the journal size in eras, 0 <= C <= H. // Key K is removed in era A(N) and re-inserted in canonical era B(N + C). // Key K is removed in era A(N) and re-inserted in non-canonical era B`(N + C). - // Key K is added in canonical era A(N) and non-canonicnal B'(N + C). + // Key K is added in non-canonical era A'(N) canonical B(N + C). // record new commit's details. let batch = WriteBatch::new(); From 6c36a7e1a6258643ec8f5f00c1a9d127b9e96401 Mon Sep 17 00:00:00 2001 From: arkpar Date: Sun, 7 Feb 2016 21:18:51 +0100 Subject: [PATCH 06/14] Apply all removes after updating all counters --- util/src/journaldb.rs | 61 +++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/util/src/journaldb.rs b/util/src/journaldb.rs index c13bdee62..371e60c58 100644 --- a/util/src/journaldb.rs +++ b/util/src/journaldb.rs @@ -20,7 +20,7 @@ use common::*; use rlp::*; use hashdb::*; use memorydb::*; -use rocksdb::{DB, Writable, WriteBatch, IteratorMode, DBVector}; +use rocksdb::{DB, Writable, WriteBatch, IteratorMode}; #[cfg(test)] use std::env; @@ -105,12 +105,16 @@ impl JournalDB { // we remove all of its removes assuming it is canonical and all // of its inserts otherwise. // - // we also keep track of the counters for each key inserted in the journal to handle - // the following cases where key K must not be deleted from the DB: + // We also keep reference counters for each key inserted in the journal to handle + // the following cases where key K must not be deleted from the DB when processing removals : // Given H is the journal size in eras, 0 <= C <= H. // Key K is removed in era A(N) and re-inserted in canonical era B(N + C). // Key K is removed in era A(N) and re-inserted in non-canonical era B`(N + C). // Key K is added in non-canonical era A'(N) canonical B(N + C). + // + // The counter is encreased each time a key is inserted in the journal in the commit. The list of insertions + // is saved with the era record. When the era becomes end_era and goes out of journal the counter is decreased + // and the key is safe to delete. // record new commit's details. let batch = WriteBatch::new(); @@ -131,7 +135,7 @@ impl JournalDB { let mut r = RlpStream::new_list(3); let inserts: Vec = self.overlay.keys().iter().filter(|&(_, &c)| c > 0).map(|(key, _)| key.clone()).collect(); - // Increase counter for each insrted key no matter if the block is canonical or not. + // Increase counter for each inserted key no matter if the block is canonical or not. for i in &inserts { *counters.entry(i.clone()).or_insert(0) += 1; } @@ -146,7 +150,8 @@ impl JournalDB { if let Some((end_era, canon_id)) = end { let mut index = 0usize; let mut last; - let mut canon_data: Option = None; + let mut to_remove: Vec = Vec::new(); + let mut canon_inserts: Vec = Vec::new(); while let Some(rlp_data) = try!(self.backing.get({ let mut r = RlpStream::new_list(2); r.append(&end_era); @@ -154,30 +159,30 @@ impl JournalDB { last = r.drain(); &last })) { - let canon = { - let rlp = Rlp::new(&rlp_data); - if canon_id != rlp.val_at(0) { - let to_add: Vec = rlp.val_at(1); - JournalDB::apply_removes(&to_add, &to_add, &mut counters, &batch); - false - } else { true } - }; - if canon { - canon_data = Some(rlp_data) + let rlp = Rlp::new(&rlp_data); + let inserts: Vec = rlp.val_at(1); + JournalDB::decrease_counters(&inserts, &mut counters); + // Collect keys to be removed. These are removed keys for canonical block, inserted for non-canonical + if canon_id == rlp.val_at(0) { + to_remove.extend(rlp.at(2).iter().map(|r| r.as_val::())); + canon_inserts = inserts; + } + else { + to_remove.extend(inserts); } try!(batch.delete(&last)); index += 1; } - // Canon must be commited last to handle a case when counter reaches 0 in a sibling block - if let Some(ref c) = canon_data { - let rlp = Rlp::new(&c); - let deleted = JournalDB::apply_removes(&rlp.val_at::>(1), &rlp.val_at::>(2), &mut counters, &batch); - trace!("JournalDB: delete journal for time #{}.{}, (canon was {}): {} entries", end_era, index, canon_id, deleted); - } + let canon_inserts = canon_inserts.drain(..).collect::>(); + // Purge removed keys if they are not referenced and not re-inserted in the canon commit + for h in to_remove.iter().filter(|h| !counters.contains_key(h) && !canon_inserts.contains(h)) { + try!(batch.delete(&h)); + } try!(batch.put(&LAST_ERA_KEY, &encode(&end_era))); } + // Commit overlay insertions let mut ret = 0u32; let mut deletes = 0usize; for i in self.overlay.drain().into_iter() { @@ -199,10 +204,10 @@ impl JournalDB { Ok(ret) } - fn apply_removes(added: &[H256], removed: &[H256], counters: &mut HashMap, batch: &WriteBatch) -> usize { - let mut deleted = 0usize; - // Decrease the counters first - for i in added.iter() { + + // Decrease counters for given keys. Deletes obsolete counters + fn decrease_counters(keys: &[H256], counters: &mut HashMap) { + for i in keys.iter() { let delete_counter = { if let Some(mut cnt) = counters.get_mut(i) { *cnt -= 1; @@ -214,12 +219,6 @@ impl JournalDB { counters.remove(i); } } - // Remove only if counter reached zero - for i in removed.iter().filter(|i| !counters.contains_key(i)) { - batch.delete(&i).expect("Low-level database error. Some issue with your hard disk?"); - deleted += 1; - } - deleted } fn payload(&self, key: &H256) -> Option { From 63f2f42035f0bef9b508e74fff73c6b1f3781c59 Mon Sep 17 00:00:00 2001 From: arkpar Date: Sun, 7 Feb 2016 22:16:58 +0100 Subject: [PATCH 07/14] Restored trace --- util/src/journaldb.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/util/src/journaldb.rs b/util/src/journaldb.rs index 371e60c58..e805f0a60 100644 --- a/util/src/journaldb.rs +++ b/util/src/journaldb.rs @@ -176,10 +176,13 @@ impl JournalDB { let canon_inserts = canon_inserts.drain(..).collect::>(); // Purge removed keys if they are not referenced and not re-inserted in the canon commit + let mut deletes = 0; for h in to_remove.iter().filter(|h| !counters.contains_key(h) && !canon_inserts.contains(h)) { try!(batch.delete(&h)); + deletes += 1; } try!(batch.put(&LAST_ERA_KEY, &encode(&end_era))); + trace!("JournalDB: delete journal for time #{}.{}, (canon was {}): {} entries", end_era, index, canon_id, deletes); } // Commit overlay insertions From 0772cb6d42dfbae9bc5385474a377fb8a5db257d Mon Sep 17 00:00:00 2001 From: arkpar Date: Sun, 7 Feb 2016 23:07:36 +0100 Subject: [PATCH 08/14] Panic on missing counters; Client cleanup --- ethcore/src/client.rs | 10 ++++------ util/src/journaldb.rs | 8 +++----- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/ethcore/src/client.rs b/ethcore/src/client.rs index 3a0309c1c..ce176615d 100644 --- a/ethcore/src/client.rs +++ b/ethcore/src/client.rs @@ -155,8 +155,7 @@ impl ClientReport { pub struct Client { chain: Arc>, engine: Arc>, - state_db: Arc, - state_journal: Mutex, + state_db: Mutex, block_queue: RwLock, report: RwLock, import_lock: Mutex<()> @@ -209,8 +208,7 @@ impl Client { Ok(Arc::new(Client { chain: chain, engine: engine.clone(), - state_db: db.clone(), - state_journal: Mutex::new(JournalDB::new_with_arc(db)), + state_db: Mutex::new(state_db), block_queue: RwLock::new(BlockQueue::new(engine, message_channel)), report: RwLock::new(Default::default()), import_lock: Mutex::new(()), @@ -265,7 +263,7 @@ impl Client { } } - let db = self.state_journal.lock().unwrap().clone(); + let db = self.state_db.lock().unwrap().clone(); let result = match enact_verified(&block, self.engine.deref().deref(), db, &parent, &last_hashes) { Ok(b) => b, Err(e) => { @@ -302,7 +300,7 @@ impl Client { /// Get a copy of the best block's state. pub fn state(&self) -> State { - State::from_existing(JournalDB::new_with_arc(self.state_db.clone()), HeaderView::new(&self.best_block_header()).state_root(), self.engine.account_start_nonce()) + State::from_existing(self.state_db.lock().unwrap().clone(), HeaderView::new(&self.best_block_header()).state_root(), self.engine.account_start_nonce()) } /// Get info on the cache. diff --git a/util/src/journaldb.rs b/util/src/journaldb.rs index e805f0a60..d9d7b29cf 100644 --- a/util/src/journaldb.rs +++ b/util/src/journaldb.rs @@ -212,11 +212,9 @@ impl JournalDB { fn decrease_counters(keys: &[H256], counters: &mut HashMap) { for i in keys.iter() { let delete_counter = { - if let Some(mut cnt) = counters.get_mut(i) { - *cnt -= 1; - *cnt == 0 - } - else { false } + let cnt = counters.get_mut(i).expect("Missing key counter"); + *cnt -= 1; + *cnt == 0 }; if delete_counter { counters.remove(i); From e097d504a4706a9f91f49dbbe9838fd41d63a39a Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Mon, 8 Feb 2016 00:07:09 +0100 Subject: [PATCH 09/14] Update README for new PPAs. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index dc0498d26..b30672498 100644 --- a/README.md +++ b/README.md @@ -11,11 +11,11 @@ ### Building from source -##### Ubuntu 14.04 +##### Ubuntu 14.04, 15.04, 15.10 ```bash # install rocksdb -add-apt-repository "deb http://ppa.launchpad.net/giskou/librocksdb/ubuntu trusty main" +add-apt-repository ppa:ethcore/ethcore apt-get update apt-get install -y --force-yes librocksdb @@ -32,7 +32,7 @@ cd parity cargo build --release ``` -##### Linux +##### Other Linux ```bash # install rocksdb From 06f943ee25482919aeff399c54c38b15f44f29e1 Mon Sep 17 00:00:00 2001 From: arkpar Date: Mon, 8 Feb 2016 00:36:08 +0100 Subject: [PATCH 10/14] Minor change --- ethcore/src/client.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/ethcore/src/client.rs b/ethcore/src/client.rs index ce176615d..d6b91acc9 100644 --- a/ethcore/src/client.rs +++ b/ethcore/src/client.rs @@ -67,7 +67,6 @@ impl fmt::Display for BlockChainInfo { } } - /// Blockchain database client. Owns and manages a blockchain and a block queue. pub trait BlockChainClient : Sync + Send { /// Get raw block header data by block header hash. From a0be2a9a0138da50e745816da77b134f1e9bcd02 Mon Sep 17 00:00:00 2001 From: arkpar Date: Mon, 8 Feb 2016 00:46:59 +0100 Subject: [PATCH 11/14] Submodule over https --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 95ac098ec..06b71f6ae 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "ethcore/res/ethereum/tests"] path = ethcore/res/ethereum/tests - url = git@github.com:ethereum/tests - branch = develop \ No newline at end of file + url = https://github.com/ethereum/tests.git + branch = develop From 55012a6fa6518838504adea2fb9aa50f18623969 Mon Sep 17 00:00:00 2001 From: Arkadiy Paronyan Date: Mon, 8 Feb 2016 00:48:55 +0100 Subject: [PATCH 12/14] travis-ci.com -> travis-ci.com --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b30672498..ebd920544 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ [![Build Status][travis-image]][travis-url] [![Coverage Status][coveralls-image]][coveralls-url] [![Join the chat at https://gitter.im/trogdoro/xiki][gitter-image]][gitter-url] -[travis-image]: https://travis-ci.com/ethcore/parity.svg?token=DMFvZu71iaTbUYx9UypX&branch=master -[travis-url]: https://travis-ci.com/ethcore/parity +[travis-image]: https://travis-ci.org/ethcore/parity.svg?token=DMFvZu71iaTbUYx9UypX&branch=master +[travis-url]: https://travis-ci.org/ethcore/parity [coveralls-image]: https://coveralls.io/repos/github/ethcore/parity/badge.svg?branch=master&t=Fk0OuQ [coveralls-url]: https://coveralls.io/r/ethcore/parity?branch=master [gitter-image]: https://badges.gitter.im/Join%20Chat.svg From 30c0406502b33161b942e499d449a02e10939903 Mon Sep 17 00:00:00 2001 From: Arkadiy Paronyan Date: Mon, 8 Feb 2016 00:52:21 +0100 Subject: [PATCH 13/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ebd920544..57ea0530a 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status][travis-image]][travis-url] [![Coverage Status][coveralls-image]][coveralls-url] [![Join the chat at https://gitter.im/trogdoro/xiki][gitter-image]][gitter-url] -[travis-image]: https://travis-ci.org/ethcore/parity.svg?token=DMFvZu71iaTbUYx9UypX&branch=master +[travis-image]: https://travis-ci.org/ethcore/parity.svg?branch=master [travis-url]: https://travis-ci.org/ethcore/parity [coveralls-image]: https://coveralls.io/repos/github/ethcore/parity/badge.svg?branch=master&t=Fk0OuQ [coveralls-url]: https://coveralls.io/r/ethcore/parity?branch=master From 871428b9004965bdcdccf02a6041a90b8ccf1a8c Mon Sep 17 00:00:00 2001 From: Marek Kotewicz Date: Mon, 8 Feb 2016 09:46:27 +0100 Subject: [PATCH 14/14] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 57ea0530a..75971d9e9 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,8 @@ [gitter-image]: https://badges.gitter.im/Join%20Chat.svg [gitter-url]: https://gitter.im/ethcore/parity?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge +[Documentation](http://ethcore.github.io/parity/ethcore/index.html) + ### Building from source ##### Ubuntu 14.04, 15.04, 15.10