[FAB-5413] Add initial execution in retry process.

Retry process should do an initial execution before starting
retry time ticker, otherwise there is a delay for each retry,
which accumulatively will cause slow start of kafka chain.

Change-Id: I9c2aafeb73e366b72d94e317088548e4754ee8c4
Signed-off-by: Jay Guo <[email protected]>

Author: guoger

orderer/consensus/kafka/retry.go

@@ -52,7 +52,14 @@ func (rp *retryProcess) try(interval, total time.Duration) error {
 		return fmt.Errorf("illegal value")
 	}
 
-	var err = fmt.Errorf("process has not been executed yet")
+	var err error
+
+	// If initial operation is successful, we don't bother start retry process
+	logger.Debugf("[channel: %s] "+rp.msg, rp.channel.topic())
+	if err := rp.fn(); err == nil {
+		logger.Debugf("[channel: %s] Error is nil, breaking the retry loop", rp.channel.topic())
+		return err
+	}
 
 	tickInterval := time.NewTicker(interval)
 	tickTotal := time.NewTicker(total)

orderer/consensus/kafka/retry_test.go

@@ -26,14 +26,6 @@ func TestRetry(t *testing.T) {
 
 	errorFn := func() error { return fmt.Errorf("foo") }
 
-	t.Run("Exit", func(t *testing.T) {
-		exitChan := make(chan struct{})
-		close(exitChan)
-		rp = newRetryProcess(mockRetryOptions, exitChan, mockChannel, "foo", noErrorFn)
-		assert.Error(t, rp.retry(), "Expected retry to return an error")
-		assert.Equal(t, false, flag, "Expected flag to remain set to false")
-	})
-
 	t.Run("Proper", func(t *testing.T) {
 		exitChan := make(chan struct{})
 		rp = newRetryProcess(mockRetryOptions, exitChan, mockChannel, "foo", noErrorFn)