From a8d89513f554812eea70cc4362c40af4fd1e0d60 Mon Sep 17 00:00:00 2001
From: rickr <cr22rc@gmail.com>
Date: Thu, 16 Nov 2017 12:53:25 -0500
Subject: [PATCH] FAB-7009 Send orderer provide exception

PS
4 Shuffle orderers case first always is failing and provide load balancing.
5 Minor tweak Arraylist probably faster for this.

Change-Id: Idcdaaa02a61198b4e55090743ba83ea28e184278
Signed-off-by: rickr <cr22rc@gmail.com>
---
 .../org/hyperledger/fabric/sdk/Channel.java   | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/hyperledger/fabric/sdk/Channel.java b/src/main/java/org/hyperledger/fabric/sdk/Channel.java
index bc176732..5da0514c 100644
--- a/src/main/java/org/hyperledger/fabric/sdk/Channel.java
+++ b/src/main/java/org/hyperledger/fabric/sdk/Channel.java
@@ -2362,7 +2362,11 @@ public CompletableFuture<TransactionEvent> sendTransaction(Collection<ProposalRe
             if (null == orderers) {
                 throw new InvalidArgumentException("sendTransaction Orderers is null");
             }
-            if (orderers.isEmpty()) {
+
+            final ArrayList<Orderer> shuffeldOrderers = new ArrayList<>(orderers);
+            Collections.shuffle(shuffeldOrderers);
+
+            if (shuffeldOrderers.isEmpty()) {
                 throw new InvalidArgumentException("sendTransaction Orderers to send to is empty.");
             }
 
@@ -2415,9 +2419,10 @@ public CompletableFuture<TransactionEvent> sendTransaction(Collection<ProposalRe
 
             logger.debug(format("Channel %s sending transaction to orderer(s) with TxID %s ", name, proposalTransactionID));
             boolean success = false;
+            Exception lException = null; // Save last exception to report to user .. others are just logged.
 
             BroadcastResponse resp = null;
-            for (Orderer orderer : orderers) {
+            for (Orderer orderer : shuffeldOrderers) {
                 try {
 
                     if (null != diagnosticFileDumper) {
@@ -2426,25 +2431,30 @@ public CompletableFuture<TransactionEvent> sendTransaction(Collection<ProposalRe
                     }
 
                     resp = orderer.sendTransaction(transactionEnvelope);
+                    lException = null; // no longer last exception .. maybe just failed.
                     if (resp.getStatus() == Status.SUCCESS) {
                         success = true;
                         break;
                     }
                 } catch (Exception e) {
-                    String emsg = format("Channel %s unsuccessful sendTransaction to orderer", name);
+                    String emsg = format("Channel %s unsuccessful sendTransaction to orderer %s (%s)",
+                            name, orderer.getName(), orderer.getUrl());
                     if (resp != null) {
 
-                        emsg = format("Channel %s unsuccessful sendTransaction to orderer.  %s", name, getRespData(resp));
+                        emsg = format("Channel %s unsuccessful sendTransaction to orderer %s (%s).  %s",
+                                name, orderer.getName(), orderer.getUrl(), getRespData(resp));
                     }
 
                     logger.error(emsg, e);
+                    lException = new Exception(emsg, e);
 
                 }
 
             }
 
             if (success) {
-                logger.debug(format("Channel %s successful sent to Orderer transaction id: %s", name, proposalTransactionID));
+                logger.debug(format("Channel %s successful sent to Orderer transaction id: %s",
+                        name, proposalTransactionID));
                 return sret;
             } else {
 
@@ -2454,7 +2464,7 @@ public CompletableFuture<TransactionEvent> sendTransaction(Collection<ProposalRe
                 unregisterTxListener(proposalTransactionID);
 
                 CompletableFuture<TransactionEvent> ret = new CompletableFuture<>();
-                ret.completeExceptionally(new Exception(emsg));
+                ret.completeExceptionally(lException != null ? new Exception(emsg, lException) : new Exception(emsg));
                 return ret;
             }
         } catch (Exception e) {
@@ -2469,6 +2479,7 @@ public CompletableFuture<TransactionEvent> sendTransaction(Collection<ProposalRe
 
     /**
      * Build response details
+     *
      * @param resp
      * @return
      */