From 47faca36e0b597f593033dc2af72d59354fb958c Mon Sep 17 00:00:00 2001 From: Josh Kneubuhl Date: Wed, 4 May 2022 11:16:26 -0400 Subject: [PATCH] Add a workaround for DNS timeouts when connecting to the orderers Signed-off-by: Josh Kneubuhl --- test-network-k8s/network | 1 + test-network-k8s/scripts/chaincode.sh | 3 +++ test-network-k8s/scripts/channel.sh | 9 +++++---- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/test-network-k8s/network b/test-network-k8s/network index d4db63d3..f4e5b472 100755 --- a/test-network-k8s/network +++ b/test-network-k8s/network @@ -29,6 +29,7 @@ export CLUSTER_NAME=${TEST_NETWORK_KIND_CLUSTER_NAME:-kind} export NS=${TEST_NETWORK_KUBE_NAMESPACE:-${NETWORK_NAME}} export DOMAIN=${TEST_NETWORK_DOMAIN:-vcap.me} export CHANNEL_NAME=${TEST_NETWORK_CHANNEL_NAME:-mychannel} +export ORDERER_TIMEOUT=${TEST_NETWORK_ORDERER_TIMEOUT:-10s} # see https://github.com/hyperledger/fabric/issues/3372 export TEMP_DIR=${PWD}/build LOG_FILE=${TEST_NETWORK_LOG_FILE:-network.log} diff --git a/test-network-k8s/scripts/chaincode.sh b/test-network-k8s/scripts/chaincode.sh index 7c9e6fbd..f203d5f9 100755 --- a/test-network-k8s/scripts/chaincode.sh +++ b/test-network-k8s/scripts/chaincode.sh @@ -101,6 +101,7 @@ function invoke_chaincode() { -C $CHANNEL_NAME \ -c $@ \ --orderer org0-orderer1.${DOMAIN}:443 \ + --connTimeout ${ORDERER_TIMEOUT} \ --tls --cafile ${TEMP_DIR}/channel-msp/ordererOrganizations/org0/orderers/org0-orderer1/tls/signcerts/tls-cert.pem sleep 2 @@ -240,6 +241,7 @@ function approve_chaincode() { --package-id ${cc_id} \ --sequence 1 \ --orderer org0-orderer1.${DOMAIN}:443 \ + --connTimeout ${ORDERER_TIMEOUT} \ --tls --cafile ${TEMP_DIR}/channel-msp/ordererOrganizations/org0/orderers/org0-orderer1/tls/signcerts/tls-cert.pem pop_fn @@ -261,6 +263,7 @@ function commit_chaincode() { --version 1 \ --sequence 1 \ --orderer org0-orderer1.${DOMAIN}:443 \ + --connTimeout ${ORDERER_TIMEOUT} \ --tls --cafile ${TEMP_DIR}/channel-msp/ordererOrganizations/org0/orderers/org0-orderer1/tls/signcerts/tls-cert.pem pop_fn diff --git a/test-network-k8s/scripts/channel.sh b/test-network-k8s/scripts/channel.sh index 6eb69549..cd96f70a 100644 --- a/test-network-k8s/scripts/channel.sh +++ b/test-network-k8s/scripts/channel.sh @@ -264,8 +264,9 @@ function join_channel_peer() { export_peer_context $org $peer peer channel join \ - --blockpath ${TEMP_DIR}/genesis_block.pb \ - --orderer org0-orderer1.${DOMAIN} \ - --tls \ - --cafile ${TEMP_DIR}/channel-msp/ordererOrganizations/org0/orderers/org0-orderer1/tls/signcerts/tls-cert.pem + --blockpath ${TEMP_DIR}/genesis_block.pb \ + --orderer org0-orderer1.${DOMAIN} \ + --connTimeout ${ORDERER_TIMEOUT} \ + --tls \ + --cafile ${TEMP_DIR}/channel-msp/ordererOrganizations/org0/orderers/org0-orderer1/tls/signcerts/tls-cert.pem }