Merge pull request #750 from aklenik/fix-orderer-timeout

Fix Fabric orderer error handling
hyperledger-caliper · Mar 3, 2020 · 2b77a1c · 2b77a1c
2 parents f19275a + 0a51d0e
commit 2b77a1c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/packages/caliper-fabric/lib/adaptor-versions/v1/fabric-v1.js b/packages/caliper-fabric/lib/adaptor-versions/v1/fabric-v1.js
@@ -1826,10 +1826,13 @@ class Fabric extends BlockchainInterface {
 
                 broadcastResponse = await responsePromise;
             } catch (err) {
-                // missing the ACK does not mean anything, the Tx could be already under ordering
-                // so let the events decide the final status, but log this error
+                // either an explicit deny from the orderer
+                // or a timeout occurred (eating up all the allocated time for the TX)
                 invokeStatus.Set(`broadcast_error_${targetOrderer}`, err.message);
-                logger.warn(`Broadcast error from ${targetOrderer}: ${err.message}`);
+                invokeStatus.SetVerification(true);
+
+                errors.push(new Error(`Broadcast error from ${targetOrderer}: ${err.message}`));
+                throw errors;
             }
 
             invokeStatus.Set('time_orderer_ack', Date.now());

diff --git a/packages/caliper-fabric/lib/adaptor-versions/v2/fabric-v2.js b/packages/caliper-fabric/lib/adaptor-versions/v2/fabric-v2.js
@@ -1826,10 +1826,13 @@ class Fabric extends BlockchainInterface {
 
                 broadcastResponse = await responsePromise;
             } catch (err) {
-                // missing the ACK does not mean anything, the Tx could be already under ordering
-                // so let the events decide the final status, but log this error
+                // either an explicit deny from the orderer
+                // or a timeout occurred (eating up all the allocated time for the TX)
                 invokeStatus.Set(`broadcast_error_${targetOrderer}`, err.message);
-                logger.warn(`Broadcast error from ${targetOrderer}: ${err.message}`);
+                invokeStatus.SetVerification(true);
+
+                errors.push(new Error(`Broadcast error from ${targetOrderer}: ${err.message}`));
+                throw errors;
             }
 
             invokeStatus.Set('time_orderer_ack', Date.now());