cherry pick pingcap#24881 to release-4.0

Signed-off-by: ti-srebot <[email protected]>
ti-srebot · May 27, 2021 · 530a40b · 530a40b
1 parent 57fa70a
commit 530a40b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/executor/infoschema_reader.go b/executor/infoschema_reader.go
@@ -1199,7 +1199,7 @@ func (e *memtableRetriever) setNewTiKVRegionPeersCols(region *helper.RegionInfo)
 	}
 	downPeerMap := make(map[int64]int64, len(region.DownPeers))
 	for _, peerStat := range region.DownPeers {
-		downPeerMap[peerStat.ID] = peerStat.DownSec
+		downPeerMap[peerStat.Peer.ID] = peerStat.DownSec
 	}
 	for _, peer := range region.Peers {
 		row := make([]types.Datum, len(infoschema.TableTiKVRegionPeersCols))
@@ -1216,11 +1216,11 @@ func (e *memtableRetriever) setNewTiKVRegionPeersCols(region *helper.RegionInfo)
 		} else {
 			row[4].SetInt64(0)
 		}
-		if pendingPeerIDSet.Exist(peer.ID) {
-			row[5].SetString(pendingPeer, mysql.DefaultCollationName)
-		} else if downSec, ok := downPeerMap[peer.ID]; ok {
+		if downSec, ok := downPeerMap[peer.ID]; ok {
 			row[5].SetString(downPeer, mysql.DefaultCollationName)
 			row[6].SetInt64(downSec)
+		} else if pendingPeerIDSet.Exist(peer.ID) {
+			row[5].SetString(pendingPeer, mysql.DefaultCollationName)
 		} else {
 			row[5].SetString(normalPeer, mysql.DefaultCollationName)
 		}

diff --git a/store/helper/helper.go b/store/helper/helper.go
@@ -417,8 +417,8 @@ type RegionEpoch struct {
 
 // RegionPeerStat stores one field `DownSec` which indicates how long it's down than `RegionPeer`.
 type RegionPeerStat struct {
-	RegionPeer
-	DownSec int64 `json:"down_seconds"`
+	Peer    RegionPeer `json:"peer"`
+	DownSec int64      `json:"down_seconds"`
 }
 
 // RegionInfo stores the information of one region.