Skip to content

Commit 5f74213

Browse files
committed
restart Explorer after channel creation
Signed-off-by: OsamaRab3 <osrab3@gmail.com>
1 parent 40d612c commit 5f74213

11 files changed

+95
-268
lines changed

e2e-network/docker/test-02-v2-raft-2orgs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ waitForContainer "peer1.org1.example.com" "Membership view has changed. peers we
8383
waitForContainer "db.explorer.example.com" "database system is ready to accept connections" "200"
8484
# // the next check is not working because explorer needs needs to be restarted first
8585
# // see the issue: https://github.com/hyperledger-labs/fablo/issues/604
86-
# waitForContainer "explorer.example.com" "Successfully created channel event hub for \[my-channel1\]" "200"
86+
waitForContainer "explorer.example.com" "Successfully created channel event hub for \[my-channel1\]" "200"
8787

8888
# check if org2 is ready
8989
waitForContainer "ca.org2.example.com" "Listening on https://0.0.0.0:7054"

e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.json.test.ts.snap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1663,6 +1663,8 @@ installChannels() {
16631663
printHeadline "Creating 'my-channel1' on Org1/peer0" "U1F63B"
16641664
docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; createChannelAndJoin 'my-channel1' 'Org1MSP' 'peer0.org1.example.com:7041' 'crypto/users/Admin@org1.example.com/msp' 'orderer0.group1.orderer.example.com:7030';"
16651665
1666+
# Restart Explorer
1667+
printItalics "Restarting Explorer" "U1F504"
16661668
}
16671669
16681670
installChaincodes() {

e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1734,6 +1734,9 @@ installChannels() {
17341734
17351735
printItalics "Joining 'my-channel1' on Org1/peer1" "U1F638"
17361736
docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoin 'my-channel1' 'Org1MSP' 'peer1.org1.example.com:7042' 'crypto/users/Admin@org1.example.com/msp' 'orderer0.group1.orderer.example.com:7030';"
1737+
1738+
# Restart Explorer
1739+
printItalics "Restarting Explorer" "U1F504"
17371740
}
17381741
17391742
installChaincodes() {

e2e/__snapshots__/fablo-config-hlf2-1org-2chaincode-raft-ccaas.json.test.ts.snap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1786,6 +1786,8 @@ installChannels() {
17861786
printHeadline "Creating 'my-channel2' on Org1/peer0" "U1F63B"
17871787
docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel2' 'Org1MSP' 'peer0.org1.example.com:7041' 'crypto/users/Admin@org1.example.com/msp' 'crypto/users/Admin@org1.example.com/tls' 'crypto-orderer/tlsca.orderer.example.com-cert.pem' 'orderer0.group1.orderer.example.com:7030';"
17881788
1789+
# Restart Explorer
1790+
printItalics "Restarting Explorer" "U1F504"
17891791
}
17901792
17911793
installChaincodes() {

e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.test.ts.snap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2471,6 +2471,9 @@ installChannels() {
24712471
docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoin 'my-channel1' 'Org1MSP' 'peer1.org1.example.com:7042' 'crypto/users/Admin@org1.example.com/msp' 'orderer0.group1.orderer.example.com:7030';"
24722472
printItalics "Joining 'my-channel1' on Org2/peer0" "U1F638"
24732473
docker exec -i cli.org2.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoin 'my-channel1' 'Org2MSP' 'peer0.org2.example.com:7061' 'crypto/users/Admin@org2.example.com/msp' 'orderer0.group1.orderer.example.com:7030';"
2474+
2475+
# Restart Explorer
2476+
printItalics "Restarting Explorer" "U1F504"
24742477
}
24752478
24762479
installChaincodes() {

e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4038,6 +4038,11 @@ installChannels() {
40384038
docker exec -i cli.org2.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel3' 'Org2MSP' 'peer0.org2.example.com:7081' 'crypto/users/Admin@org2.example.com/msp' 'crypto/users/Admin@org2.example.com/tls' 'crypto-orderer/tlsca.orderer2.com-cert.pem' 'orderer0.group2.orderer2.com:7050';"
40394039
printItalics "Joining 'my-channel3' on Org2/peer1" "U1F638"
40404040
docker exec -i cli.org2.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel3' 'Org2MSP' 'peer1.org2.example.com:7082' 'crypto/users/Admin@org2.example.com/msp' 'crypto/users/Admin@org2.example.com/tls' 'crypto-orderer/tlsca.orderer2.com-cert.pem' 'orderer0.group2.orderer2.com:7050';"
4041+
4042+
# Restart Explorer
4043+
printItalics "Restarting Explorer" "U1F504"
4044+
echo "Restarting global Explorer: explorer.example.com"
4045+
docker restart explorer.example.com || true
40414046
}
40424047
40434048
installChaincodes() {

e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4474,6 +4474,11 @@ installChannels() {
44744474
docker exec -i cli.org2.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel3' 'Org2MSP' 'peer0.org2.example.com:7061' 'crypto/users/Admin@org2.example.com/msp' 'crypto/users/Admin@org2.example.com/tls' 'crypto-orderer/tlsca.orderer.example.com-cert.pem' 'orderer0.group1.orderer.example.com:7030';"
44754475
printItalics "Joining 'my-channel3' on Org2/peer1" "U1F638"
44764476
docker exec -i cli.org2.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel3' 'Org2MSP' 'peer1.org2.example.com:7062' 'crypto/users/Admin@org2.example.com/msp' 'crypto/users/Admin@org2.example.com/tls' 'crypto-orderer/tlsca.orderer.example.com-cert.pem' 'orderer0.group1.orderer.example.com:7030';"
4477+
4478+
# Restart Explorer
4479+
printItalics "Restarting Explorer" "U1F504"
4480+
echo "Restarting global Explorer: explorer.example.com"
4481+
docker restart explorer.example.com || true
44774482
}
44784483
44794484
installChaincodes() {

e2e/__snapshots__/fablo-config-hlf3-1orgs-1chaincode.json.test.ts.snap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1947,6 +1947,9 @@ installChannels() {
19471947
19481948
printItalics "Joining 'my-channel1' on Org1/peer1" "U1F638"
19491949
docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel1' 'Org1MSP' 'peer1.org1.example.com:7042' 'crypto/users/Admin@org1.example.com/msp' 'crypto/users/Admin@org1.example.com/tls' 'crypto-orderer/tlsca.orderer.example.com-cert.pem' 'orderer0.group1.orderer.example.com:7030';"
1950+
1951+
# Restart Explorer
1952+
printItalics "Restarting Explorer" "U1F504"
19501953
}
19511954
19521955
installChaincodes() {

e2e/__snapshots__/fablo-config-hlf3-bft-1orgs-1chaincode.json.test.ts.snap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1971,6 +1971,9 @@ installChannels() {
19711971
19721972
printItalics "Joining 'my-channel1' on Org1/peer1" "U1F638"
19731973
docker exec -i cli.org1.example.com bash -c "source scripts/channel_fns.sh; fetchChannelAndJoinTls 'my-channel1' 'Org1MSP' 'peer1.org1.example.com:7042' 'crypto/users/Admin@org1.example.com/msp' 'crypto/users/Admin@org1.example.com/tls' 'crypto-orderer/tlsca.orderer.example.com-cert.pem' 'orderer0.group1.orderer.example.com:7030';"
1974+
1975+
# Restart Explorer
1976+
printItalics "Restarting Explorer" "U1F504"
19741977
}
19751978
19761979
installChaincodes() {

0 commit comments

Comments
 (0)