les, light: minor fixes

ethereum · Sep 17, 2019 · 2f204d6 · 2f204d6
1 parent 921fb56
commit 2f204d6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/les/costtracker.go b/les/costtracker.go
@@ -360,6 +360,7 @@ func (ct *costTracker) gfLoop() {
  default:
  }
  }
+ globalFactorGauge.Update(int64(1000 * factor))
  log.Debug("global cost factor updated", "factor", factor)
  }
  }

diff --git a/les/metrics.go b/les/metrics.go
@@ -66,8 +66,8 @@ var (
  miscServingTimeReceiptTimer = metrics.NewRegisteredTimer("les/misc/serve/receipt", nil)
  miscServingTimeTrieProofTimer = metrics.NewRegisteredTimer("les/misc/serve/proof", nil)
  miscServingTimeHelperTrieTimer = metrics.NewRegisteredTimer("les/misc/serve/helperTrie", nil)
- miscServingTimeTxTimer = metrics.NewRegisteredTimer("les/misc/serve/tx", nil)
- miscServingTimeTxStatusTimer = metrics.NewRegisteredTimer("les/misc/serve/txstatus", nil)
+ miscServingTimeTxTimer = metrics.NewRegisteredTimer("les/misc/serve/txs", nil)
+ miscServingTimeTxStatusTimer = metrics.NewRegisteredTimer("les/misc/serve/txStatus", nil)
 
  connectionTimer = metrics.NewRegisteredTimer("les/connection/duration", nil)
  serverConnectionGauge = metrics.NewRegisteredGauge("les/connection/server", nil)
@@ -88,10 +88,11 @@ var (
  relativeCostReceiptHistogram = metrics.NewRegisteredHistogram("les/server/req/relative/receipt", nil, metrics.NewExpDecaySample(1028, 0.015))
  relativeCostCodeHistogram = metrics.NewRegisteredHistogram("les/server/req/relative/code", nil, metrics.NewExpDecaySample(1028, 0.015))
  relativeCostProofHistogram = metrics.NewRegisteredHistogram("les/server/req/relative/proof", nil, metrics.NewExpDecaySample(1028, 0.015))
- relativeCostHelperProofHistogram = metrics.NewRegisteredHistogram("les/server/req/relative/helperproof", nil, metrics.NewExpDecaySample(1028, 0.015))
- relativeCostSendTxHistogram = metrics.NewRegisteredHistogram("les/server/req/relative/sendtx", nil, metrics.NewExpDecaySample(1028, 0.015))
- relativeCostTxStatusHistogram = metrics.NewRegisteredHistogram("les/server/req/relative/txstatus", nil, metrics.NewExpDecaySample(1028, 0.015))
+ relativeCostHelperProofHistogram = metrics.NewRegisteredHistogram("les/server/req/relative/helperTrie", nil, metrics.NewExpDecaySample(1028, 0.015))
+ relativeCostSendTxHistogram = metrics.NewRegisteredHistogram("les/server/req/relative/txs", nil, metrics.NewExpDecaySample(1028, 0.015))
+ relativeCostTxStatusHistogram = metrics.NewRegisteredHistogram("les/server/req/relative/txStatus", nil, metrics.NewExpDecaySample(1028, 0.015))
 
+ globalFactorGauge = metrics.NewRegisteredGauge("les/server/globalFactor", nil)
  recentServedGauge = metrics.NewRegisteredGauge("les/server/recentRequestServed", nil)
  recentEstimatedGauge = metrics.NewRegisteredGauge("les/server/recentRequestEstimated", nil)
  sqServedGauge = metrics.NewRegisteredGauge("les/server/servingQueue/served", nil)

diff --git a/light/lightchain.go b/light/lightchain.go
@@ -438,9 +438,6 @@ func (lc *LightChain) GetBlockHashesFromHash(hash common.Hash, max uint64) []com
 //
 // Note: ancestor == 0 returns the same block, 1 returns its parent and so on.
 func (lc *LightChain) GetAncestor(hash common.Hash, number, ancestor uint64, maxNonCanonical *uint64) (common.Hash, uint64) {
- lc.chainmu.RLock()
- defer lc.chainmu.RUnlock()
-
  return lc.hc.GetAncestor(hash, number, ancestor, maxNonCanonical)
 }