checker: judging that the peer is down is no longer based on DownSeco…

…nds (tikv#4078) (tikv#4082) * checker: judging that the peer is down is no longer based on DownSeconds Signed-off-by: HunDunDM <hundundm@gmail.com> * address comment Signed-off-by: HunDunDM <hundundm@gmail.com> Co-authored-by: HunDunDM <hundundm@gmail.com>
Connor1996 · Sep 6, 2021 · a41aaa7 · a41aaa7
1 parent 1542092
commit a41aaa7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/server/schedule/checker/replica_checker.go b/server/schedule/checker/replica_checker.go
@@ -106,13 +106,10 @@ func (r *ReplicaChecker) checkDownPeer(region *core.RegionInfo) *operator.Operat
  log.Warn("lost the store, maybe you are recovering the PD cluster", zap.Uint64("store-id", storeID))
  return nil
  }
+ // Only consider the state of the Store, not `stats.DownSeconds`.
  if store.DownTime() < r.opts.GetMaxStoreDownTime() {
  continue
  }
- if stats.GetDownSeconds() < uint64(r.opts.GetMaxStoreDownTime().Seconds()) {
- continue
- }
-
  return r.fixPeer(region, storeID, downStatus)
  }
  return nil

diff --git a/server/schedule/checker/rule_checker.go b/server/schedule/checker/rule_checker.go
@@ -270,12 +270,10 @@ func (c *RuleChecker) isDownPeer(region *core.RegionInfo, peer *metapb.Peer) boo
  log.Warn("lost the store, maybe you are recovering the PD cluster", zap.Uint64("store-id", storeID))
  return false
  }
+ // Only consider the state of the Store, not `stats.DownSeconds`.
  if store.DownTime() < c.cluster.GetOpts().GetMaxStoreDownTime() {
  continue
  }
- if stats.GetDownSeconds() < uint64(c.cluster.GetOpts().GetMaxStoreDownTime().Seconds()) {
- continue
- }
  return true
  }
  return false