FAB 18365 evictionsuspicion failing when osn failed (#2780)

after committing config block in orderer but before applying it raft. Signed-off-by: Parameswaran Selvam <parselva@in.ibm.com>
hyperledger · Jul 23, 2021 · 463271e · 463271e
1 parent fe71474
commit 463271e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/orderer/consensus/etcdraft/eviction.go b/orderer/consensus/etcdraft/eviction.go
@@ -113,13 +113,6 @@ func (es *evictionSuspector) confirmSuspicion(cumulativeSuspicion time.Duration)
 
 	es.logger.Infof("Last config block was found to be block [%d]", lastConfigBlock.Header.Number)
 
-	height := es.height()
-
-	if lastConfigBlock.Header.Number+1 <= height {
-		es.logger.Infof("Our height is higher or equal than the height of the orderer we pulled the last block from, aborting.")
-		return
-	}
-
 	err = es.amIInChannel(lastConfigBlock)
 	if err != cluster.ErrNotInChannel && err != cluster.ErrForbidden {
 		details := fmt.Sprintf(", our certificate was found in config block with sequence %d", lastConfigBlock.Header.Number)
@@ -131,12 +124,18 @@ func (es *evictionSuspector) confirmSuspicion(cumulativeSuspicion time.Duration)
 		es.triggerCatchUp(&raftpb.Snapshot{Data: protoutil.MarshalOrPanic(lastConfigBlock)})
 		return
 	}
-
 	es.logger.Warningf("Detected our own eviction from the channel in block [%d]", lastConfigBlock.Header.Number)
 
 	es.logger.Infof("Waiting for chain to halt")
 	es.halt()
 	es.halted = true
+
+	height := es.height()
+	if lastConfigBlock.Header.Number+1 <= height {
+		es.logger.Infof("Our height is higher or equal than the height of the orderer we pulled the last block from, aborting.")
+		return
+	}
+
 	es.logger.Infof("Chain has been halted, pulling remaining blocks up to (and including) eviction block.")
 
 	nextBlock := height

diff --git a/orderer/consensus/etcdraft/eviction_test.go b/orderer/consensus/etcdraft/eviction_test.go
@@ -168,14 +168,6 @@ func TestEvictionSuspector(t *testing.T) {
 			expectedPanic:              "Failed creating a block puller: oops",
 			halt:                       t.Fail,
 		},
-		{
-			description:                "our height is the highest",
-			expectedLog:                "Our height is higher or equal than the height of the orderer we pulled the last block from, aborting",
-			evictionSuspicionThreshold: 10*time.Minute - time.Second,
-			blockPuller:                puller,
-			height:                     10,
-			halt:                       t.Fail,
-		},
 		{
 			description:                "failed pulling the block",
 			expectedLog:                "Cannot confirm our own eviction from the channel: bad block",
@@ -194,6 +186,15 @@ func TestEvictionSuspector(t *testing.T) {
 			height:                     9,
 			halt:                       t.Fail,
 		},
+		{
+			description:                "our height is the highest",
+			expectedLog:                "Our height is higher or equal than the height of the orderer we pulled the last block from, aborting",
+			evictionSuspicionThreshold: 10*time.Minute - time.Second,
+			amIInChannelReturns:        cluster.ErrNotInChannel,
+			blockPuller:                puller,
+			height:                     10,
+			halt:                       func() {},
+		},
 		{
 			description:                 "we are not in the channel",
 			expectedLog:                 "Detected our own eviction from the channel in block [9]",