Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Fabric orderer error handling #750

Merged
merged 1 commit into from
Mar 3, 2020
Merged

Fix Fabric orderer error handling #750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions packages/caliper-fabric/lib/adaptor-versions/v1/fabric-v1.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
9 changes: 6 additions & 3 deletions packages/caliper-fabric/lib/adaptor-versions/v2/fabric-v2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down