cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3373 from karalabe/ethstats-block-fields

Browse Source 
ethstats: don't drop concurrent head reports (mini forks)
This commit is contained in:
Péter Szilágyi 2016-11-30 12:36:22 +02:00 committed by GitHub
commit a90a170361
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ethstats/ethstats.go
View File

@ -144,18 +144,13 @@ func (s *Service) loop() {
if err = s.report(in, out); err != nil { if err = s.report(in, out); err != nil {
glog.V(logger.Warn).Infof("Full stats report failed: %v", err) glog.V(logger.Warn).Infof("Full stats report failed: %v", err)
} }
case <-headSub.Chan(): case head := <-headSub.Chan():
// Exhaust events to avoid reporting too frequently if err = s.reportBlock(out, head.Data.(core.ChainHeadEvent).Block); err != nil {
for exhausted := false; !exhausted; {
select {
case <-headSub.Chan():
default:
exhausted = true
}
}
if err = s.reportBlock(out); err != nil {
glog.V(logger.Warn).Infof("Block stats report failed: %v", err) glog.V(logger.Warn).Infof("Block stats report failed: %v", err)
} }
if err = s.reportPending(out); err != nil {
glog.V(logger.Warn).Infof("Post-block transaction stats report failed: %v", err)
}
case <-txSub.Chan(): case <-txSub.Chan():
// Exhaust events to avoid reporting too frequently // Exhaust events to avoid reporting too frequently
for exhausted := false; !exhausted; { for exhausted := false; !exhausted; {
@ -245,7 +240,7 @@ func (s *Service) report(in *json.Decoder, out *json.Encoder) error {
if err := s.reportLatency(in, out); err != nil { if err := s.reportLatency(in, out); err != nil {
return err return err
} }
if err := s.reportBlock(out); err != nil { if err := s.reportBlock(out, nil); err != nil {
return err return err
} }
if err := s.reportPending(out); err != nil { if err := s.reportPending(out); err != nil {
@ -326,7 +321,7 @@ func (s uncleStats) MarshalJSON() ([]byte, error) {
} }
// reportBlock retrieves the current chain head and repors it to the stats server. // reportBlock retrieves the current chain head and repors it to the stats server.
func (s *Service) reportBlock(out *json.Encoder) error { func (s *Service) reportBlock(out *json.Encoder, block *types.Block) error {
// Gather the head block infos from the local blockchain // Gather the head block infos from the local blockchain
var ( var (
head *types.Header head *types.Header
@ -336,16 +331,21 @@ func (s *Service) reportBlock(out *json.Encoder) error {
) )
if s.eth != nil { if s.eth != nil {
// Full nodes have all needed information available // Full nodes have all needed information available
block := s.eth.BlockChain().CurrentBlock() if block == nil {
block = s.eth.BlockChain().CurrentBlock()
head = s.eth.BlockChain().CurrentHeader() }
head = block.Header()
td = s.eth.BlockChain().GetTd(head.Hash(), head.Number.Uint64()) td = s.eth.BlockChain().GetTd(head.Hash(), head.Number.Uint64())
txs = block.Transactions() txs = block.Transactions()
uncles = block.Uncles() uncles = block.Uncles()
} else { } else {
// Light nodes would need on-demand lookups for transactions/uncles, skip // Light nodes would need on-demand lookups for transactions/uncles, skip
head = s.les.BlockChain().CurrentHeader() if block != nil {
head = block.Header()
} else {
head = s.les.BlockChain().CurrentHeader()
}
td = s.les.BlockChain().GetTd(head.Hash(), head.Number.Uint64()) td = s.les.BlockChain().GetTd(head.Hash(), head.Number.Uint64())
} }
// Assemble the block stats report and send it to the server // Assemble the block stats report and send it to the server