[FAB-8143] Clear error between retry attempts

Change-Id: I563522b62357b7499be5b673df634ecbcc2f1fad
Signed-off-by: Divyank Katira <Divyank.Katira@securekey.com>

pkg/fabric-client/mocks/mockpeer.go

@@ -9,13 +9,15 @@ package mocks
 // TODO: Move protos to this library
 import (
 	"encoding/pem"
+	"sync"
 
 	"github.com/hyperledger/fabric-sdk-go/api/apifabclient"
 	pb "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/peer"
 )
 
 // MockPeer is a mock fabricsdk.Peer.
 type MockPeer struct {
+	RWLock               *sync.RWMutex
 	Error                error
 	MockName             string
 	MockURL              string
@@ -30,7 +32,7 @@ type MockPeer struct {
 
 // NewMockPeer creates basic mock peer
 func NewMockPeer(name string, url string) *MockPeer {
-	mp := &MockPeer{MockName: name, MockURL: url, Status: 200}
+	mp := &MockPeer{MockName: name, MockURL: url, Status: 200, RWLock: &sync.RWMutex{}}
 	return mp
 }
 
@@ -81,6 +83,10 @@ func (p *MockPeer) URL() string {
 
 // ProcessTransactionProposal does not send anything anywhere but returns an empty mock ProposalResponse
 func (p *MockPeer) ProcessTransactionProposal(tp apifabclient.TransactionProposal) (apifabclient.TransactionProposalResult, error) {
+	if p.RWLock != nil {
+		p.RWLock.Lock()
+		defer p.RWLock.Unlock()
+	}
 	p.ProcessProposalCalls++
 	return apifabclient.TransactionProposalResult{
 		Endorser: p.MockURL,

pkg/fabric-txn/chclient/chclient.go

@@ -20,9 +20,12 @@ import (
 	"github.com/hyperledger/fabric-sdk-go/pkg/fabric-txn/discovery"
 	"github.com/hyperledger/fabric-sdk-go/pkg/fabric-txn/discovery/greylist"
 	txnHandlerImpl "github.com/hyperledger/fabric-sdk-go/pkg/fabric-txn/txnhandler"
+	"github.com/hyperledger/fabric-sdk-go/pkg/logging"
 	"github.com/pkg/errors"
 )
 
+var logger = logging.NewLogger("fabric_sdk_go")
+
 const (
 	defaultHandlerTimeout = time.Second * 10
 )
@@ -110,9 +113,14 @@ func (cc *ChannelClient) resolveRetry(req *chclient.RequestContext, opts chclien
 	if !req.RetryHandler.Required(req.Error) {
 		return false
 	}
+	logger.Infof("Retrying on error %s", req.Error)
+
 	cc.greylist.Greylist(req.Error)
-	// Reset processors
+	// Reset context parameters
 	req.Opts.ProposalProcessors = opts.ProposalProcessors
+	req.Error = nil
+	req.Response = chclient.Response{}
+
 	return true
 }
 

pkg/fabric-txn/chclient/chclient_test.go

@@ -369,20 +369,32 @@ func TestTransactionValidationError(t *testing.T) {
 
 func TestExecuteTxWithRetries(t *testing.T) {
 	testStatus := status.New(status.EndorserClientStatus, status.ConnectionFailed.ToInt32(), "test", nil)
+	testResp := []byte("test")
+	retryInterval := 2 * time.Second
 
 	testPeer1 := fcmocks.NewMockPeer("Peer1", "http://peer1.com")
 	testPeer1.Error = testStatus
 	chClient := setupChannelClient([]apifabclient.Peer{testPeer1}, t)
 	retryOpts := retry.DefaultOpts
-	retryOpts.InitialBackoff = 1 * time.Microsecond
+	retryOpts.Attempts = 1
+	retryOpts.BackoffFactor = 1
+	retryOpts.InitialBackoff = retryInterval
 	retryOpts.RetryableCodes = retry.ChannelClientRetryableCodes
 
-	_, err := chClient.Query(chclient.Request{ChaincodeID: "testCC", Fcn: "invoke", Args: [][]byte{[]byte("query"), []byte("b")}},
+	go func() {
+		// Remove peer error condition after retry attempt interval
+		time.Sleep(retryInterval / 2)
+		testPeer1.RWLock.Lock()
+		testPeer1.Error = nil
+		testPeer1.Payload = testResp
+		testPeer1.RWLock.Unlock()
+	}()
+
+	resp, err := chClient.Query(chclient.Request{ChaincodeID: "testCC", Fcn: "invoke", Args: [][]byte{[]byte("query"), []byte("b")}},
 		chclient.WithRetry(retryOpts))
-	if err == nil {
-		t.Fatalf("Should have failed for not success status")
-	}
-	assert.Equal(t, retry.DefaultOpts.Attempts, testPeer1.ProcessProposalCalls-1, "Expected peer to be called (retry attempts + 1) times")
+	assert.Nil(t, err, "expected error to be nil")
+	assert.Equal(t, 2, testPeer1.ProcessProposalCalls, "Expected peer to be called twice")
+	assert.Equal(t, testResp, resp.Payload, "expected correct response")
 }
 
 func TestDiscoveryGreylist(t *testing.T) {