Skip to content

Commit 855bc2f

Browse files
committed
Base. Fixed user-data after breaking changes in snapshot archive and docker-compose startup parameters
1 parent 46d7a7f commit 855bc2f

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

lib/base/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ npx cdk deploy base-single-node --json --outputs-file single-node-deploy.json
146146
After deployment you can watch the progress with CloudWatch dashboard (see [Monitoring](#monitoring)) or check the progress manually. For manual access, use SSM to connect into EC2 first and watch the log like this:
147147

148148
```bash
149-
export INSTANCE_ID=$(cat single-node-deploy.json | jq -r '..|.node-instance-id? | select(. != null)')
149+
export INSTANCE_ID=$(cat single-node-deploy.json | jq -r '..|.nodeinstanceid? | select(. != null)')
150150
echo "INSTANCE_ID=" $INSTANCE_ID
151151
export AWS_REGION=us-east-1
152152
aws ssm start-session --target $INSTANCE_ID --region $AWS_REGION
@@ -159,7 +159,7 @@ jq -r .result.unsafe_l2.timestamp))/60)) minutes
159159
3. Test Base RPC API
160160
Use curl to query from within the node instance:
161161
```bash
162-
export INSTANCE_ID=$(cat single-node-deploy.json | jq -r '..|.node-instance-id? | select(. != null)')
162+
export INSTANCE_ID=$(cat single-node-deploy.json | jq -r '..|.nodeinstanceid? | select(. != null)')
163163
echo "INSTANCE_ID=" $INSTANCE_ID
164164
export AWS_REGION=us-east-1
165165
aws ssm start-session --target $INSTANCE_ID --region $AWS_REGION

lib/base/lib/assets/base/node-start.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#!/bin/bash
22
set -e
3-
echo "Script is starting..."
3+
export CLIENT=geth
44

5+
echo "Script is starting client $CLIENT"
56
# Start the node
67
cd /home/bcuser/node
78
/usr/local/bin/docker-compose -f /home/bcuser/node/docker-compose.yml up -d

lib/base/lib/assets/base/node-stop.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
set -e
3-
echo "Script is stopping the node..."
4-
3+
export CLIENT=geth
4+
echo "Script is stopping client $CLIENT"
55
# Stop the node
66
cd /home/bcuser/node
77
/usr/local/bin/docker-compose -f /home/bcuser/node/docker-compose.yml down

lib/base/lib/assets/restore-from-snapshot-archive-s3.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ s5cmd --log error cp s3://base-snapshots-$NETWORK_ID-archive/$LATEST_SNAPSHOT_FI
1515
echo "Downloading Snapshot script finished" && \
1616
sleep 60 &&\
1717
echo "Starting snapshot decompression ..." && \
18-
tar -zxvf $SNAPSHOT_DIR/$SNAPSHOT_FILE_NAME -C /data 2>&1 | tee unzip.log && echo "decompresed successfully..." || echo "decompression failed..." >> snapshots-decompression.log
18+
tar --use-compress-program=unzstd -xvf $SNAPSHOT_DIR/$SNAPSHOT_FILE_NAME -C /data 2>&1 | tee unzip.log && echo "decompresed successfully..." || echo "decompression failed..." >> snapshots-decompression.log
1919

2020
echo "Decompresed snapshot, cleaning up..."
2121

lib/base/lib/assets/restore-from-snapshot-http.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ sleep 60
4646

4747
echo "Starting snapshot decompression ..."
4848

49-
tar -zxvf $SNAPSHOT_DIR/$SNAPSHOT_FILE_NAME -C /data 2>&1 | tee unzip.log && echo "decompresed successfully..." || echo "decompression failed..." >> snapshots-decompression.log
49+
tar --use-compress-program=unzstd -xvf $SNAPSHOT_DIR/$SNAPSHOT_FILE_NAME -C /data 2>&1 | tee unzip.log && echo "decompresed successfully..." || echo "decompression failed..." >> snapshots-decompression.log
5050

5151
echo "Decompresed snapshot, cleaning up..."
5252

0 commit comments

Comments
 (0)