remove unnecessary changed

Signed-off-by: lhy1024 <admin@liudos.us>
tikv · Nov 3, 2023 · 68b1677 · 68b1677
1 parent a9633ae
commit 68b1677
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/server/core/store.go b/server/core/store.go
@@ -496,9 +496,6 @@ var (
 // tikv's store heartbeat for a short time, maybe caused by process restart or
 // temporary network failure.
 func (s *StoreInfo) IsDisconnected() bool {
- if s == nil {
- return true
- }
  return s.DownTime() > storeDisconnectDuration
 }
 

diff --git a/server/schedule/checker/rule_checker.go b/server/schedule/checker/rule_checker.go
@@ -462,7 +462,7 @@ func (c *RuleChecker) fixOrphanPeers(region *core.RegionInfo, fit *placement.Reg
  if pinDownPeer.GetIsWitness() || orphanPeer.GetIsWitness() {
  continue
  }
- // down peer's store should be disconnected
+ // pinDownPeer's store should be disconnected, because we use more strict judge before.
  if !isDisconnectedPeer(pinDownPeer) {
  continue
  }
@@ -497,10 +497,6 @@ func (c *RuleChecker) fixOrphanPeers(region *core.RegionInfo, fit *placement.Reg
  checkerCounter.WithLabelValues("rule_checker", "remove-orphan-peer").Inc()
  return operator.CreateRemovePeerOperator("remove-unhealthy-orphan-peer", c.cluster, 0, region, orphanPeer.StoreId)
  }
- if isDisconnectedPeer(orphanPeer) {
- checkerCounter.WithLabelValues("rule_checker", "remove-orphan-peer").Inc()
- return operator.CreateRemovePeerOperator("remove-disconnected-orphan-peer", c.cluster, 0, region, orphanPeer.StoreId)
- }
  if hasHealthPeer {
  // there already exists a healthy orphan peer, so we can remove other orphan Peers.
  checkerCounter.WithLabelValues("rule_checker", "remove-orphan-peer").Inc()