Skip to content

Commit 7b529e2

Browse files
dzikowskidzikowski
authored
Merge branch 'main' into fix/ccaas-multiorg
2 parents 938b923 + c17514c commit 7b529e2

15 files changed

+269
-54
lines changed

‎docs/schema.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,8 @@
178178
"type": "string",
179179
"enum": [
180180
"sqlite",
181-
"postgres"
181+
"postgres",
182+
"mysql"
182183
]
183184
}
184185
}

‎e2e-network/docker/test-04-v3-snapshot-ccaas.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ networkUp
5151

5252
# check if all nodes are ready
5353
waitForContainer "orderer0.group1.orderer.example.com" "Starting Raft node channel=my-channel1"
54-
waitForContainer "db.ca.org1.example.com" "database system is ready to accept connections"
54+
waitForContainer "db.ca.org1.example.com" "ready for connections"
5555
waitForContainer "ca.org1.example.com" "Listening on https://0.0.0.0:7054"
5656
waitForContainer "couchdb.peer0.org1.example.com" "Apache CouchDB has started. Time to relax."
5757
waitForContainer "peer0.org1.example.com" "Joining gossip network of channel my-channel1 with 1 organizations"

‎e2e/__snapshots__/extendConfig.test.ts.snap‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9216,7 +9216,7 @@ exports[`extend config samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json
92169216
"address": "ca.org1.example.com",
92179217
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
92189218
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
9219-
"db": "postgres",
9219+
"db": "mysql",
92209220
"exposePort": 7040,
92219221
"fullAddress": "ca.org1.example.com:7054",
92229222
"port": 7054,
@@ -9358,7 +9358,7 @@ exports[`extend config samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json
93589358
"address": "ca.org1.example.com",
93599359
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
93609360
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
9361-
"db": "postgres",
9361+
"db": "mysql",
93629362
"exposePort": 7040,
93639363
"fullAddress": "ca.org1.example.com:7054",
93649364
"port": 7054,
@@ -9447,7 +9447,7 @@ exports[`extend config samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json
94479447
"address": "ca.org1.example.com",
94489448
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
94499449
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
9450-
"db": "postgres",
9450+
"db": "mysql",
94519451
"exposePort": 7040,
94529452
"fullAddress": "ca.org1.example.com:7054",
94539453
"port": 7054,
@@ -9547,7 +9547,7 @@ exports[`extend config samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json
95479547
"address": "ca.org1.example.com",
95489548
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
95499549
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
9550-
"db": "postgres",
9550+
"db": "mysql",
95519551
"exposePort": 7040,
95529552
"fullAddress": "ca.org1.example.com:7054",
95539553
"port": 7054,
@@ -9689,7 +9689,7 @@ exports[`extend config samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json
96899689
"address": "ca.org1.example.com",
96909690
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
96919691
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
9692-
"db": "postgres",
9692+
"db": "mysql",
96939693
"exposePort": 7040,
96949694
"fullAddress": "ca.org1.example.com:7054",
96959695
"port": 7054,
@@ -9778,7 +9778,7 @@ exports[`extend config samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json
97789778
"address": "ca.org1.example.com",
97799779
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
97809780
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
9781-
"db": "postgres",
9781+
"db": "mysql",
97829782
"exposePort": 7040,
97839783
"fullAddress": "ca.org1.example.com:7054",
97849784
"port": 7054,
@@ -9877,7 +9877,7 @@ exports[`extend config samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json
98779877
"address": "ca.org1.example.com",
98789878
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
98799879
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
9880-
"db": "postgres",
9880+
"db": "mysql",
98819881
"exposePort": 7040,
98829882
"fullAddress": "ca.org1.example.com:7054",
98839883
"port": 7054,
@@ -10019,7 +10019,7 @@ exports[`extend config samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json
1001910019
"address": "ca.org1.example.com",
1002010020
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
1002110021
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
10022-
"db": "postgres",
10022+
"db": "mysql",
1002310023
"exposePort": 7040,
1002410024
"fullAddress": "ca.org1.example.com:7054",
1002510025
"port": 7054,
@@ -10105,7 +10105,7 @@ exports[`extend config samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json
1010510105
"address": "ca.org1.example.com",
1010610106
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
1010710107
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
10108-
"db": "postgres",
10108+
"db": "mysql",
1010910109
"exposePort": 7040,
1011010110
"fullAddress": "ca.org1.example.com:7054",
1011110111
"port": 7054,
@@ -10247,7 +10247,7 @@ exports[`extend config samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json
1024710247
"address": "ca.org1.example.com",
1024810248
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
1024910249
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
10250-
"db": "postgres",
10250+
"db": "mysql",
1025110251
"exposePort": 7040,
1025210252
"fullAddress": "ca.org1.example.com:7054",
1025310253
"port": 7054,
@@ -10490,7 +10490,7 @@ exports[`extend config samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json
1049010490
"address": "ca.org1.example.com",
1049110491
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
1049210492
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
10493-
"db": "postgres",
10493+
"db": "mysql",
1049410494
"exposePort": 7040,
1049510495
"fullAddress": "ca.org1.example.com:7054",
1049610496
"port": 7054,
@@ -13565,7 +13565,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = `
1356513565
"address": "ca.org1.example.com",
1356613566
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
1356713567
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
13568-
"db": "postgres",
13568+
"db": "mysql",
1356913569
"exposePort": 7040,
1357013570
"fullAddress": "ca.org1.example.com:7054",
1357113571
"port": 7054,
@@ -13707,7 +13707,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = `
1370713707
"address": "ca.org1.example.com",
1370813708
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
1370913709
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
13710-
"db": "postgres",
13710+
"db": "mysql",
1371113711
"exposePort": 7040,
1371213712
"fullAddress": "ca.org1.example.com:7054",
1371313713
"port": 7054,
@@ -13796,7 +13796,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = `
1379613796
"address": "ca.org1.example.com",
1379713797
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
1379813798
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
13799-
"db": "postgres",
13799+
"db": "mysql",
1380013800
"exposePort": 7040,
1380113801
"fullAddress": "ca.org1.example.com:7054",
1380213802
"port": 7054,
@@ -13896,7 +13896,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = `
1389613896
"address": "ca.org1.example.com",
1389713897
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
1389813898
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
13899-
"db": "postgres",
13899+
"db": "mysql",
1390013900
"exposePort": 7040,
1390113901
"fullAddress": "ca.org1.example.com:7054",
1390213902
"port": 7054,
@@ -14038,7 +14038,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = `
1403814038
"address": "ca.org1.example.com",
1403914039
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
1404014040
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
14041-
"db": "postgres",
14041+
"db": "mysql",
1404214042
"exposePort": 7040,
1404314043
"fullAddress": "ca.org1.example.com:7054",
1404414044
"port": 7054,
@@ -14127,7 +14127,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = `
1412714127
"address": "ca.org1.example.com",
1412814128
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
1412914129
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
14130-
"db": "postgres",
14130+
"db": "mysql",
1413114131
"exposePort": 7040,
1413214132
"fullAddress": "ca.org1.example.com:7054",
1413314133
"port": 7054,
@@ -14226,7 +14226,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = `
1422614226
"address": "ca.org1.example.com",
1422714227
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
1422814228
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
14229-
"db": "postgres",
14229+
"db": "mysql",
1423014230
"exposePort": 7040,
1423114231
"fullAddress": "ca.org1.example.com:7054",
1423214232
"port": 7054,
@@ -14368,7 +14368,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = `
1436814368
"address": "ca.org1.example.com",
1436914369
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
1437014370
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
14371-
"db": "postgres",
14371+
"db": "mysql",
1437214372
"exposePort": 7040,
1437314373
"fullAddress": "ca.org1.example.com:7054",
1437414374
"port": 7054,
@@ -14454,7 +14454,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = `
1445414454
"address": "ca.org1.example.com",
1445514455
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
1445614456
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
14457-
"db": "postgres",
14457+
"db": "mysql",
1445814458
"exposePort": 7040,
1445914459
"fullAddress": "ca.org1.example.com:7054",
1446014460
"port": 7054,
@@ -14596,7 +14596,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = `
1459614596
"address": "ca.org1.example.com",
1459714597
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
1459814598
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
14599-
"db": "postgres",
14599+
"db": "mysql",
1460014600
"exposePort": 7040,
1460114601
"fullAddress": "ca.org1.example.com:7054",
1460214602
"port": 7054,
@@ -14839,7 +14839,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = `
1483914839
"address": "ca.org1.example.com",
1484014840
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
1484114841
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
14842-
"db": "postgres",
14842+
"db": "mysql",
1484314843
"exposePort": 7040,
1484414844
"fullAddress": "ca.org1.example.com:7054",
1484514845
"port": 7054,

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

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3428,6 +3428,11 @@ __getCAPostgresNodes() {
34283428
"
34293429
}
34303430
3431+
__getCAMySQLNodes() {
3432+
echo "
3433+
"
3434+
}
3435+
34313436
__createSnapshot() {
34323437
cd "$FABLO_NETWORK_ROOT/.."
34333438
backup_dir="\${1:-"snapshot-$(date -u +"%Y%m%d%H%M%S")"}"
@@ -3447,11 +3452,17 @@ __createSnapshot() {
34473452
done
34483453
34493454
for node in $(__getCAPostgresNodes); do
3450-
echo "Saving state of $node..."
3455+
echo "Saving state of $node (PostgreSQL)..."
34513456
mkdir -p "$backup_dir/$node/pg-data"
34523457
docker exec "$node" pg_dump -c --if-exists -U postgres fabriccaserver >"$backup_dir/$node/fabriccaserver.sql"
34533458
done
34543459
3460+
for node in $(__getCAMySQLNodes); do
3461+
echo "Saving state of $node (MySQL)..."
3462+
mkdir -p "$backup_dir/$node/mysql-data"
3463+
docker exec -e MYSQL_PWD=caDbPass12345 "$node" mysqldump -u root --add-drop-database --databases fabriccaserver >"$backup_dir/$node/fabriccaserver.sql"
3464+
done
3465+
34553466
for node in $(__getOrdererAndPeerNodes); do
34563467
echo "Saving state of $node..."
34573468
docker cp "$node:/var/hyperledger/production/" "$backup_dir/$node/"
@@ -3487,7 +3498,16 @@ __cloneSnapshot() {
34873498
done
34883499
34893500
for node in $(__getCAPostgresNodes); do
3490-
echo "Restoring $node..."
3501+
echo "Restoring $node (PostgreSQL)..."
3502+
if [ ! -d "$node" ]; then
3503+
echo "Warning: Cannot restore '$node', directory does not exist!"
3504+
else
3505+
docker cp "./$node/fabriccaserver.sql" "$node:/docker-entrypoint-initdb.d/fabriccaserver.sql"
3506+
fi
3507+
done
3508+
3509+
for node in $(__getCAMySQLNodes); do
3510+
echo "Restoring $node (MySQL)..."
34913511
if [ ! -d "$node" ]; then
34923512
echo "Warning: Cannot restore '$node', directory does not exist!"
34933513
else

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

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3483,6 +3483,11 @@ __getCAPostgresNodes() {
34833483
"
34843484
}
34853485
3486+
__getCAMySQLNodes() {
3487+
echo "
3488+
"
3489+
}
3490+
34863491
__createSnapshot() {
34873492
cd "$FABLO_NETWORK_ROOT/.."
34883493
backup_dir="\${1:-"snapshot-$(date -u +"%Y%m%d%H%M%S")"}"
@@ -3502,11 +3507,17 @@ __createSnapshot() {
35023507
done
35033508
35043509
for node in $(__getCAPostgresNodes); do
3505-
echo "Saving state of $node..."
3510+
echo "Saving state of $node (PostgreSQL)..."
35063511
mkdir -p "$backup_dir/$node/pg-data"
35073512
docker exec "$node" pg_dump -c --if-exists -U postgres fabriccaserver >"$backup_dir/$node/fabriccaserver.sql"
35083513
done
35093514
3515+
for node in $(__getCAMySQLNodes); do
3516+
echo "Saving state of $node (MySQL)..."
3517+
mkdir -p "$backup_dir/$node/mysql-data"
3518+
docker exec -e MYSQL_PWD=caDbPass12345 "$node" mysqldump -u root --add-drop-database --databases fabriccaserver >"$backup_dir/$node/fabriccaserver.sql"
3519+
done
3520+
35103521
for node in $(__getOrdererAndPeerNodes); do
35113522
echo "Saving state of $node..."
35123523
docker cp "$node:/var/hyperledger/production/" "$backup_dir/$node/"
@@ -3542,7 +3553,16 @@ __cloneSnapshot() {
35423553
done
35433554
35443555
for node in $(__getCAPostgresNodes); do
3545-
echo "Restoring $node..."
3556+
echo "Restoring $node (PostgreSQL)..."
3557+
if [ ! -d "$node" ]; then
3558+
echo "Warning: Cannot restore '$node', directory does not exist!"
3559+
else
3560+
docker cp "./$node/fabriccaserver.sql" "$node:/docker-entrypoint-initdb.d/fabriccaserver.sql"
3561+
fi
3562+
done
3563+
3564+
for node in $(__getCAMySQLNodes); do
3565+
echo "Restoring $node (MySQL)..."
35463566
if [ ! -d "$node" ]; then
35473567
echo "Warning: Cannot restore '$node', directory does not exist!"
35483568
else

0 commit comments

Comments
 (0)