Merge pull request #162 from StayHungryStayFoolish/solana-awscli-fix

Fix Solana node installing aws-cli error on x86_64 architecture

Author: frbrkoala

lib/constructs/ha-rpc-nodes-with-alb.ts

@@ -75,18 +75,22 @@ export class HANodesConstruct extends cdkContructs.Construct {
       }
 
       if (dataVolume.type !== constants.InstanceStoreageDeviceVolumeType){
-          blockDevices.push(
-              {
-                  deviceName: constants.VolumeDeviceNames[arrayIndex],
-                  volume: autoscaling.BlockDeviceVolume.ebs(dataVolume.sizeGiB, {
-                      deleteOnTermination: true,
-                      throughput: dataVolume.throughput,
-                      encrypted: true,
-                      iops: dataVolume.iops,
-                      volumeType: autoscaling.EbsDeviceVolumeType[dataVolume.type.toUpperCase() as keyof typeof autoscaling.EbsDeviceVolumeType],
-                  }),
-              }
-          )
+          const volumeType = dataVolume.type.toUpperCase();
+          const ebsConfig: any = {
+              deleteOnTermination: true,
+              encrypted: true,
+              iops: dataVolume.iops,
+              volumeType: autoscaling.EbsDeviceVolumeType[dataVolume.type.toUpperCase() as keyof typeof autoscaling.EbsDeviceVolumeType],
+          };
+
+          if (volumeType == 'GP3'){
+              ebsConfig.throughput = dataVolume.throughput;
+          }
+
+          blockDevices.push({
+              deviceName: constants.VolumeDeviceNames[arrayIndex],
+              volume: autoscaling.BlockDeviceVolume.ebs(dataVolume.sizeGiB, ebsConfig)
+          })
       }
    });
 

lib/solana/lib/assets/instance/storage/setup.sh

@@ -32,7 +32,8 @@ get_all_empty_nvme_disks () {
   local unmounted_nvme_disks=()
   local sorted_unmounted_nvme_disks
 
-  all_not_mounted_nvme_disks=$(lsblk -lnb | awk '{if ($7=="") {print $1}}' | grep nvme)
+  #The disk will only be mounted when the nvme disk is larger than 100GB to avoid storing blockchain node data directly on the root EBS disk (which is 46GB by default)
+  all_not_mounted_nvme_disks=$(lsblk -lnb | awk '{if ($7 == "" && $4 > 100000000) {print $1}}' | grep nvme)
   all_mounted_nvme_partitions=$(mount | awk '{print $1}' | grep /dev/nvme)
   for disk in ${all_not_mounted_nvme_disks[*]}; do
     if [[ ! "${all_mounted_nvme_partitions[*]}" =~ $disk ]]; then

lib/solana/lib/assets/user-data-ubuntu.sh

@@ -33,20 +33,16 @@ apt-get -yqq install jq unzip python3-pip chrony
 
 if [ "$ARCH" == "x86_64" ]; then
   CW_AGENT_BINARY_URI=https://s3.amazonaws.com/amazoncloudwatch-agent/ubuntu/amd64/latest/amazon-cloudwatch-agent.deb
-  AWS_CLI_BINARY_URI=https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip
 else
   CW_AGENT_BINARY_URI=https://s3.amazonaws.com/amazoncloudwatch-agent/ubuntu/arm64/latest/amazon-cloudwatch-agent.deb
-  AWS_CLI_BINARY_URI=https://awscli.amazonaws.com/awscli-exe-linux-aarch64.zip
 fi
 
 cd /opt || exit 1
 
 ARCH=$(uname -m)
 
 echo "Intalling AWS CLI"
-curl "$AWS_CLI_BINARY_URI" -o "awscliv2.zip"
-unzip awscliv2.zip
-/opt/aws/install
+snap install aws-cli --classic
 
 echo "Downloading assets zip file"
 aws s3 cp $ASSETS_S3_PATH ./assets.zip --region $AWS_REGION