test

Signed-off-by: Fedor Partanskiy <fredprtnsk@gmail.com>

Author: pfi79

integration/raft/cft_test.go

@@ -346,7 +346,8 @@ var _ = Describe("EndToEnd Crash Fault Tolerance", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Adding new ordering service node")
-			time.Sleep(5 * time.Second)
+			// time.Sleep(5 * time.Second)
+			Eventually(ordererRunners[0].Err(), network.EventuallyTimeout, time.Second).Should(gbytes.Say("store active nodes - "))
 			addConsenter(network, peer, orderers[0], "testchannel", &etcdraft.Consenter{
 				ServerTlsCert: ordererCert,
 				ClientTlsCert: ordererCert,
@@ -828,6 +829,9 @@ var _ = Describe("EndToEnd Crash Fault Tolerance", func() {
 
 			By("submitting config updates to orderers with expired TLS certs to replace the expired certs")
 			timeShift := 5 * time.Minute
+			Eventually(o1Runner.Err(), network.EventuallyTimeout, time.Second).Should(gbytes.Say("store active nodes - "))
+			Eventually(o2Runner.Err(), network.EventuallyTimeout, time.Second).Should(gbytes.Say("store active nodes - "))
+			Eventually(o3Runner.Err(), network.EventuallyTimeout, time.Second).Should(gbytes.Say("store active nodes - "))
 			for _, o := range orderers {
 				channelConfig := fetchConfig(network, peer, o, nwo.ClusterPort, "testchannel", timeShift)
 				c := conftx.New(channelConfig)
@@ -840,7 +844,7 @@ var _ = Describe("EndToEnd Crash Fault Tolerance", func() {
 				Expect(err).NotTo(HaveOccurred())
 
 				By("updating the config for " + o.Name)
-				time.Sleep(5 * time.Second)
+				// time.Sleep(5 * time.Second)
 				updateOrdererConfig(network, o, nwo.ClusterPort, "testchannel", timeShift, c.OriginalConfig(), c.UpdatedConfig(), peer, o)
 			}
 

integration/raft/config_test.go

@@ -562,6 +562,7 @@ var _ = Describe("EndToEnd reconfiguration and onboarding", func() {
 				port := network.OrdererPort(targetOrderer, nwo.ClusterPort)
 
 				fmt.Fprintf(GinkgoWriter, "Rotating certificate of orderer node %d\n", target+1)
+				Eventually(ordererRunners[target].Err(), network.EventuallyTimeout, time.Second).Should(gbytes.Say("store active nodes - "))
 				swap(submitterOrderer, rotation.oldCert, &etcdraft.Consenter{
 					ServerTlsCert: rotation.newCert,
 					ClientTlsCert: rotation.newCert,
@@ -613,13 +614,13 @@ var _ = Describe("EndToEnd reconfiguration and onboarding", func() {
 			}
 
 			By(fmt.Sprintf("Rotating cert on leader %d", leader))
-			time.Sleep(5 * time.Second)
+			// time.Sleep(5 * time.Second)
 			rotate(leaderIndex)
 
 			By("Rotating certificates of other orderer nodes")
 			for i := range certificateRotations {
 				if i != leaderIndex {
-					time.Sleep(5 * time.Second)
+					// time.Sleep(5 * time.Second)
 					rotate(i)
 				}
 			}
@@ -705,7 +706,8 @@ var _ = Describe("EndToEnd reconfiguration and onboarding", func() {
 				port := network.OrdererPort(o, nwo.ClusterPort)
 
 				By(fmt.Sprintf("Adding the future certificate of orderer node %d", i))
-				time.Sleep(5 * time.Second)
+				// time.Sleep(5 * time.Second)
+				Eventually(ordererRunners[i].Err(), network.EventuallyTimeout, time.Second).Should(gbytes.Say("store active nodes - "))
 				for _, channelName := range []string{"testchannel"} {
 					addConsenter(network, peer, o, channelName, &etcdraft.Consenter{
 						ServerTlsCert: rotation.newCert,
@@ -732,7 +734,8 @@ var _ = Describe("EndToEnd reconfiguration and onboarding", func() {
 				assertBlockReception(expectedBlockNumPerChannel[i*2], orderers, peer, network)
 
 				By("Removing the previous certificate of the old orderer")
-				time.Sleep(5 * time.Second)
+				// time.Sleep(5 * time.Second)
+				Eventually(ordererRunner.Err(), network.EventuallyTimeout, time.Second).Should(gbytes.Say("store active nodes - "))
 				for _, channelName := range []string{"testchannel"} {
 					removeConsenter(network, peer, network.Orderers[(i+1)%len(network.Orderers)], channelName, rotation.oldCert)
 				}
@@ -1154,7 +1157,8 @@ var _ = Describe("EndToEnd reconfiguration and onboarding", func() {
 			Expect(err).To(Not(HaveOccurred()))
 
 			ordererEvicted1st := network.Orderers[(firstEvictedNode+1)%3]
-			time.Sleep(5 * time.Second)
+			// time.Sleep(5 * time.Second)
+			Eventually(ordererRunners[(firstEvictedNode+1)%3].Err(), network.EventuallyTimeout, time.Second).Should(gbytes.Say("store active nodes - "))
 			removeConsenter(network, peer, ordererEvicted1st, "testchannel", server1CertBytes)
 
 			var survivedOrdererRunners []*ginkgomon.Runner

orderer/consensus/etcdraft/chain.go

@@ -535,6 +535,7 @@ func (c *Chain) Consensus(req *orderer.ConsensusRequest, sender uint64) error {
 
 	c.Metrics.ActiveNodes.Set(float64(len(clusterMetadata.ActiveNodes)))
 	c.ActiveNodes.Store(clusterMetadata.ActiveNodes)
+	c.logger.Debugf("store active nodes - %d", len(clusterMetadata.ActiveNodes))
 
 	return nil
 }