informant: display I/O stats (#11523)

* informant: collect I/O stats for state_db * informat: debug i/o log * informat: remove unused cache hit ratio * Cargo.lock: cargo update -p librocksdb-sys * [deps]: upgrade kvdb-rocksdb to 0.6 * Update ethcore/types/src/client_types.rs Co-Authored-By: David <[email protected]> Co-authored-by: David <[email protected]>
openethereum · Mar 17, 2020 · 70c4ed7 · 70c4ed7
1 parent 3231454
commit 70c4ed7
Show file tree

Hide file tree

Showing 16 changed files with 144 additions and 36 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -41,7 +41,7 @@ journaldb = { path = "util/journaldb" }
 jsonrpc-core = "14.0.3"
 keccak-hash = "0.4.0"
 kvdb = "0.4.0"
-kvdb-rocksdb = "0.5.0"
+kvdb-rocksdb = "0.6.0"
 log = "0.4"
 migration-rocksdb = { path = "util/migration-rocksdb" }
 node-filter = { path = "ethcore/node-filter" }

diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml
@@ -33,7 +33,7 @@ journaldb = { path = "../util/journaldb" }
 keccak-hash = "0.4.0"
 kvdb = "0.4.0"
 kvdb-memorydb = { version = "0.4.0", optional = true }
-kvdb-rocksdb = { version = "0.5.0", optional = true }
+kvdb-rocksdb = { version = "0.6.0", optional = true }
 lazy_static = { version = "1.3", optional = true }
 log = "0.4"
 machine = { path = "./machine" }
@@ -78,7 +78,7 @@ ethjson = { path = "../json", features = ["test-helpers"] }
 parity-crypto = { version = "0.5.0", features = ["publickey"] }
 fetch = { path = "../util/fetch" }
 kvdb-memorydb = "0.4.0"
-kvdb-rocksdb = "0.5.0"
+kvdb-rocksdb = "0.6.0"
 lazy_static = "1.3"
 machine = { path = "./machine", features = ["test-helpers"] }
 parity-runtime = "0.1.1"

diff --git a/ethcore/service/Cargo.toml b/ethcore/service/Cargo.toml
@@ -23,5 +23,5 @@ trace-time = "0.1"
 [dev-dependencies]
 ethcore = { path = "..", features = ["test-helpers"] }
 ethcore-db = { path = "../db" }
-kvdb-rocksdb = "0.5.0"
+kvdb-rocksdb = "0.6.0"
 tempdir = "0.3"
diff --git a/ethcore/snapshot/Cargo.toml b/ethcore/snapshot/Cargo.toml
@@ -53,7 +53,7 @@ ethabi-contract = "9.0.0"
 ethabi-derive = "9.0.1"
 ethcore = { path = "..", features = ["test-helpers"] }
 ethkey = { path = "../../accounts/ethkey" }
-kvdb-rocksdb = "0.5.0"
+kvdb-rocksdb = "0.6.0"
 lazy_static = { version = "1.3" }
 spec = { path = "../spec" }
 tempdir = "0.3"

diff --git a/ethcore/snapshot/snapshot-tests/Cargo.toml b/ethcore/snapshot/snapshot-tests/Cargo.toml
@@ -24,7 +24,7 @@ journaldb = { path = "../../../util/journaldb" }
 keccak-hash = "0.4.0"
 keccak-hasher = { path = "../../../util/keccak-hasher" }
 kvdb = "0.4.0"
-kvdb-rocksdb = "0.5.0"
+kvdb-rocksdb = "0.6.0"
 log = "0.4.8"
 parking_lot = "0.10.0"
 parity-crypto = { version = "0.5.0", features = ["publickey"] }

diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
@@ -109,7 +109,7 @@ use types::{
 	BlockNumber,
 	call_analytics::CallAnalytics,
 	chain_notify::{ChainMessageType, ChainRoute, NewBlocks},
-	client_types::{ClientReport, Mode, StateResult},
+	client_types::{ClientReport, IoStats, Mode, StateResult},
 	encoded,
 	engines::{
 		epoch::{PendingTransition, Transition as EpochTransition},
@@ -1096,7 +1096,19 @@ impl Client {
 	/// Get the report.
 	pub fn report(&self) -> ClientReport {
 		let mut report = self.report.read().clone();
-		report.state_db_mem = self.state_db.read().mem_used();
+		let state_db = self.state_db.read();
+		report.state_db_mem = state_db.mem_used();
+		let io_stats = state_db.journal_db().io_stats();
+		report.io_stats = IoStats {
+			transactions: io_stats.transactions,
+			reads: io_stats.reads,
+			cache_reads: io_stats.cache_reads,
+			writes: io_stats.writes,
+			bytes_read: io_stats.bytes_read,
+			cache_read_bytes: io_stats.cache_read_bytes,
+			bytes_written: io_stats.bytes_written,
+		};
+
 		report
 	}
 

diff --git a/ethcore/types/src/client_types.rs b/ethcore/types/src/client_types.rs
@@ -62,6 +62,27 @@ pub struct ClientReport {
 	pub gas_processed: U256,
 	/// Memory used by state DB
 	pub state_db_mem: usize,
+	/// I/O statistics for the state DB.
+	pub io_stats: IoStats,
+}
+
+/// I/O statistics.
+#[derive(Default, Debug, Clone, Eq, PartialEq)]
+pub struct IoStats {
+	/// Number of transaction.
+	pub transactions: u64,
+	/// Number of read operations.
+	pub reads: u64,
+	/// Number of reads resulted in a read from cache.
+	pub cache_reads: u64,
+	/// Number of write operations.
+	pub writes: u64,
+	/// Number of bytes read.
+	pub bytes_read: u64,
+	/// Number of bytes read from cache.
+	pub cache_read_bytes: u64,
+	/// Number of bytes write.
+	pub bytes_written: u64,
 }
 
 impl ClientReport {

diff --git a/ethcore/verification/src/queue/mod.rs b/ethcore/verification/src/queue/mod.rs
@@ -234,7 +234,7 @@ impl<K: Kind, C> VerificationQueue<K, C> {
 		let number_of_threads = if scale_verifiers {
 			max_verifiers
 		} else {
-			cmp::min(default_amount, max_verifiers)
+			default_amount
 		};
 
 		let state = Arc::new((Mutex::new(State::Work(default_amount)), Condvar::new()));

diff --git a/parity/informant.rs b/parity/informant.rs
@@ -257,6 +257,14 @@ impl<T: InformantData> Informant<T> {
 			(diffed, full_report)
 		};
 
+		debug!(
+			target: "io_stats", 
+			"{} reads, {} writes, {} transactions",
+			client_report.io_stats.reads,
+			client_report.io_stats.writes,
+			client_report.io_stats.transactions,
+		);
+
 		let Report {
 			importing,
 			chain_info,

diff --git a/util/journaldb/src/archivedb.rs b/util/journaldb/src/archivedb.rs
@@ -102,6 +102,10 @@ impl JournalDB for ArchiveDB {
 		Box::new(self.clone())
 	}
 
+	fn io_stats(&self) -> kvdb::IoStats {
+		self.backing.io_stats(kvdb::IoStatsKind::SincePrevious)
+	}
+
 	fn mem_used(&self) -> usize {
 		self.overlay.malloc_size_of()
 	}

diff --git a/util/journaldb/src/earlymergedb.rs b/util/journaldb/src/earlymergedb.rs
@@ -322,6 +322,10 @@ impl JournalDB for EarlyMergeDB {
 		Box::new(self.clone())
 	}
 
+	fn io_stats(&self) -> kvdb::IoStats {
+		self.backing.io_stats(kvdb::IoStatsKind::SincePrevious)
+	}
+
 	fn is_empty(&self) -> bool {
 		self.backing.get(self.column, &LATEST_ERA_KEY).expect("Low level database error").is_none()
 	}