From 43e4a6501beb42bc0f4fffcbcb1e3f5fe58b6062 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Mon, 22 Jun 2015 12:01:27 +0300 Subject: core, ethdb: instrument the block and state db Conflicts: ethdb/database.go --- ethdb/database.go | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'ethdb') diff --git a/ethdb/database.go b/ethdb/database.go index 5faf8c4e0..48cb37f7c 100644 --- a/ethdb/database.go +++ b/ethdb/database.go @@ -4,6 +4,7 @@ import ( "github.com/ethereum/go-ethereum/compression/rle" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger/glog" + "github.com/rcrowley/go-metrics" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/iterator" @@ -13,10 +14,11 @@ import ( var OpenFileLimit = 64 type LDBDatabase struct { - // filename for reporting - fn string - // LevelDB instance - db *leveldb.DB + fn string // filename for reporting + db *leveldb.DB // LevelDB instance + + GetMeter metrics.Meter // Meter for measuring the database get requests + PutMeter metrics.Meter // Meter for measuring the database put requests } // NewLDBDatabase returns a LevelDB wrapped object. LDBDatabase does not persist data by @@ -43,7 +45,11 @@ func NewLDBDatabase(file string) (*LDBDatabase, error) { // Put puts the given key / value to the queue func (self *LDBDatabase) Put(key []byte, value []byte) error { - return self.db.Put(key, rle.Compress(value), nil) + dat := rle.Compress(value) + if self.PutMeter != nil { + self.PutMeter.Mark(int64(len(dat))) + } + return self.db.Put(key, dat, nil) } // Get returns the given key if it's present. @@ -52,6 +58,9 @@ func (self *LDBDatabase) Get(key []byte) ([]byte, error) { if err != nil { return nil, err } + if self.GetMeter != nil { + self.GetMeter.Mark(int64(len(dat))) + } return rle.Decompress(dat) } -- cgit v1.2.3 From 792b0ddccdf135a8d9c33298bcb20d7bafb79a0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Tue, 23 Jun 2015 13:03:33 +0300 Subject: core, eth, eth/fetcher, ethdb: polish metrics gathering a bit --- ethdb/database.go | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'ethdb') diff --git a/ethdb/database.go b/ethdb/database.go index 48cb37f7c..13b4ef449 100644 --- a/ethdb/database.go +++ b/ethdb/database.go @@ -17,8 +17,11 @@ type LDBDatabase struct { fn string // filename for reporting db *leveldb.DB // LevelDB instance - GetMeter metrics.Meter // Meter for measuring the database get requests - PutMeter metrics.Meter // Meter for measuring the database put requests + GetMeter metrics.Meter // Meter for measuring the database get request counts + PutMeter metrics.Meter // Meter for measuring the database put request counts + DelMeter metrics.Meter // Meter for measuring the database delete request counts + ReadMeter metrics.Meter // Meter for measuring the database get request data usage + WriteMeter metrics.Meter // Meter for measuring the database put request data usage } // NewLDBDatabase returns a LevelDB wrapped object. LDBDatabase does not persist data by @@ -47,7 +50,10 @@ func NewLDBDatabase(file string) (*LDBDatabase, error) { func (self *LDBDatabase) Put(key []byte, value []byte) error { dat := rle.Compress(value) if self.PutMeter != nil { - self.PutMeter.Mark(int64(len(dat))) + self.PutMeter.Mark(1) + } + if self.WriteMeter != nil { + self.WriteMeter.Mark(int64(len(dat))) } return self.db.Put(key, dat, nil) } @@ -59,13 +65,19 @@ func (self *LDBDatabase) Get(key []byte) ([]byte, error) { return nil, err } if self.GetMeter != nil { - self.GetMeter.Mark(int64(len(dat))) + self.GetMeter.Mark(1) + } + if self.ReadMeter != nil { + self.ReadMeter.Mark(int64(len(dat))) } return rle.Decompress(dat) } // Delete deletes the key from the queue and database func (self *LDBDatabase) Delete(key []byte) error { + if self.DelMeter != nil { + self.DelMeter.Mark(1) + } return self.db.Delete(key, nil) } -- cgit v1.2.3 From 803b3c4a825ed0ac5d22c93fc3159651b8c590b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Tue, 23 Jun 2015 18:36:08 +0300 Subject: eth, ethdb: measure database operation latencies too --- ethdb/database.go | 39 ++++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) (limited to 'ethdb') diff --git a/ethdb/database.go b/ethdb/database.go index 13b4ef449..32ce845a0 100644 --- a/ethdb/database.go +++ b/ethdb/database.go @@ -1,6 +1,8 @@ package ethdb import ( + "time" + "github.com/ethereum/go-ethereum/compression/rle" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger/glog" @@ -17,9 +19,10 @@ type LDBDatabase struct { fn string // filename for reporting db *leveldb.DB // LevelDB instance - GetMeter metrics.Meter // Meter for measuring the database get request counts - PutMeter metrics.Meter // Meter for measuring the database put request counts - DelMeter metrics.Meter // Meter for measuring the database delete request counts + GetTimer metrics.Timer // Timer for measuring the database get request counts and latencies + PutTimer metrics.Timer // Timer for measuring the database put request counts and latencies + DelTimer metrics.Timer // Timer for measuring the database delete request counts and latencies + MissMeter metrics.Meter // MEter for measuring the missed database get requests ReadMeter metrics.Meter // Meter for measuring the database get request data usage WriteMeter metrics.Meter // Meter for measuring the database put request data usage } @@ -48,10 +51,14 @@ func NewLDBDatabase(file string) (*LDBDatabase, error) { // Put puts the given key / value to the queue func (self *LDBDatabase) Put(key []byte, value []byte) error { - dat := rle.Compress(value) - if self.PutMeter != nil { - self.PutMeter.Mark(1) + // Measure the database put latency, if requested + if self.PutTimer != nil { + start := time.Now() + defer self.PutTimer.UpdateSince(start) } + // Generate the data to write to disk, update the meter and write + dat := rle.Compress(value) + if self.WriteMeter != nil { self.WriteMeter.Mark(int64(len(dat))) } @@ -60,13 +67,20 @@ func (self *LDBDatabase) Put(key []byte, value []byte) error { // Get returns the given key if it's present. func (self *LDBDatabase) Get(key []byte) ([]byte, error) { + // Measure the database get latency, if requested + if self.GetTimer != nil { + start := time.Now() + defer self.GetTimer.UpdateSince(start) + } + // Retrieve the key and increment the miss counter if not found dat, err := self.db.Get(key, nil) if err != nil { + if self.MissMeter != nil { + self.MissMeter.Mark(1) + } return nil, err } - if self.GetMeter != nil { - self.GetMeter.Mark(1) - } + // Otherwise update the actually retrieved amount of data if self.ReadMeter != nil { self.ReadMeter.Mark(int64(len(dat))) } @@ -75,9 +89,12 @@ func (self *LDBDatabase) Get(key []byte) ([]byte, error) { // Delete deletes the key from the queue and database func (self *LDBDatabase) Delete(key []byte) error { - if self.DelMeter != nil { - self.DelMeter.Mark(1) + // Measure the database delete latency, if requested + if self.DelTimer != nil { + start := time.Now() + defer self.DelTimer.UpdateSince(start) } + // Execute the actual operation return self.db.Delete(key, nil) } -- cgit v1.2.3