Merge pull request bnb-chain#6 from flywukong/IO-metrics

fix comments second
flywukong · Feb 25, 2022 · c467683 · c467683
2 parents 3989be3 + 1d4ce16
commit c467683
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 14 deletions.
diff --git a/cachemetrics/get_gid.go b/cachemetrics/get_gid.go
@@ -27,14 +27,12 @@ func IsMinerMainRoutineID(id int64) bool {
 }
 
 func UpdateSyncingRoutineID(id int64) {
- if SyncingRoutineId != id {
- SyncingRoutineId = id
- }
+ atomic.StoreInt64(&SyncingRoutineId, id)
 }
 
 // judge if it is main process of syncing
 func IsSyncMainRoutineID(id int64) bool {
- if id == SyncingRoutineId {
+ if id == atomic.LoadInt64(&SyncingRoutineId) {
  return true
  }
  return false

diff --git a/cmd/geth/main.go b/cmd/geth/main.go
@@ -205,8 +205,6 @@ var (
  metricsFlags = []cli.Flag{
  utils.MetricsEnabledFlag,
  utils.MetricsEnabledExpensiveFlag,
- utils.MetricsEnabledRecordIOFlag,
- utils.MetricsDisablePrefetchFlag,
  utils.MetricsHTTPFlag,
  utils.MetricsPortFlag,
  utils.MetricsEnableInfluxDBFlag,

diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
@@ -744,14 +744,6 @@ var (
  Name: "metrics.expensive",
  Usage: "Enable expensive metrics collection and reporting",
  }
- MetricsDisablePrefetchFlag = cli.BoolFlag{
- Name: "metrics.noprefetch",
- Usage: "disable prefetch when metrics collecting",
- }
- MetricsEnabledRecordIOFlag = cli.BoolFlag{
- Name: "metrics.iorecord",
- Usage: "Enable recording io metrics",
- }
 
  // MetricsHTTPFlag defines the endpoint for a stand-alone metrics HTTP endpoint.
  // Since the pprof service enables sensitive/vulnerable behavior, this allows a user