From e35fe758c55c9a4feeb65a88a392d9c41a3e7b32 Mon Sep 17 00:00:00 2001
From: nolouch <nolouch@gmail.com>
Date: Wed, 8 Sep 2021 15:09:57 +0800
Subject: [PATCH] resolve conflict

Signed-off-by: nolouch <nolouch@gmail.com>
---
 server/schedule/checker/replica_checker.go | 12 +-----------
 server/schedule/checker/rule_checker.go    | 11 +----------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/server/schedule/checker/replica_checker.go b/server/schedule/checker/replica_checker.go
index 412bd3c89bd..b2067de79c1 100644
--- a/server/schedule/checker/replica_checker.go
+++ b/server/schedule/checker/replica_checker.go
@@ -188,22 +188,12 @@ 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
 		}
-<<<<<<< HEAD
+		// Only consider the state of the Store, not `stats.DownSeconds`.
 		if store.DownTime() < r.cluster.GetMaxStoreDownTime() {
 			continue
 		}
-		if stats.GetDownSeconds() < uint64(r.cluster.GetMaxStoreDownTime().Seconds()) {
-			continue
-		}
 
 		return r.fixPeer(region, peer, downStatus)
-=======
-		// Only consider the state of the Store, not `stats.DownSeconds`.
-		if store.DownTime() < r.opts.GetMaxStoreDownTime() {
-			continue
-		}
-		return r.fixPeer(region, storeID, downStatus)
->>>>>>> 63abda935 (checker: judging that the peer is down is no longer based on DownSeconds (#4078))
 	}
 	return nil
 }
diff --git a/server/schedule/checker/rule_checker.go b/server/schedule/checker/rule_checker.go
index 13c4e5ef5c0..2ef2fb922a2 100644
--- a/server/schedule/checker/rule_checker.go
+++ b/server/schedule/checker/rule_checker.go
@@ -249,19 +249,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
 		}
-<<<<<<< HEAD
-		if store.DownTime() < c.cluster.GetMaxStoreDownTime() {
-			continue
-		}
-		if stats.GetDownSeconds() < uint64(c.cluster.GetMaxStoreDownTime().Seconds()) {
-			continue
-		}
-=======
 		// Only consider the state of the Store, not `stats.DownSeconds`.
-		if store.DownTime() < c.cluster.GetOpts().GetMaxStoreDownTime() {
+		if store.DownTime() < c.cluster.GetMaxStoreDownTime() {
 			continue
 		}
->>>>>>> 63abda935 (checker: judging that the peer is down is no longer based on DownSeconds (#4078))
 		return true
 	}
 	return false