Skip to content

Commit b71b22a

Browse files
platfownerplatfowner
authored
Merge pull request #1314 from ainblockchain/bugfix/platfowner/bugfix
Use $SEASON as directory instead of prefix
2 parents c8c6e08 + 742508d commit b71b22a

4 files changed

+30
-30
lines changed

‎copy_blockchain_data_gcp.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ function upload_data() {
146146

147147
# 2. Extract tgz file for node
148148
printf "\n\n<<< Extracting tgz file for node $node_index >>>\n\n"
149-
TGZ_CMD="gcloud compute ssh $node_target_addr --command 'cd /home; sudo mkdir -p ain_blockchain_data; sudo chown runner:runner ain_blockchain_data; sudo chmod 777 ain_blockchain_data; cd ain_blockchain_data; gzip -dc ~/ain_blockchain_data.tar.gz | tar xvf -' --project $PROJECT_ID --zone $node_zone"
149+
TGZ_CMD="gcloud compute ssh $node_target_addr --command 'cd /home; sudo mkdir -p ain_blockchain_data; sudo chown $GCP_USER:$GCP_USER ain_blockchain_data; sudo chmod 777 ain_blockchain_data; cd ain_blockchain_data; gzip -dc ~/ain_blockchain_data.tar.gz | tar xvf -' --project $PROJECT_ID --zone $node_zone"
150150
printf "TGZ_CMD=$TGZ_CMD\n\n"
151151
eval $TGZ_CMD
152152

‎copy_blockchain_data_onprem.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,21 +81,21 @@ function download_data() {
8181

8282
# 1. Create tgz file for node
8383
printf "\n\n<<< Creating tgz file for node $node_index >>>\n\n"
84-
TGZ_CMD="ssh -v $node_target_addr 'cd /home/${SEASON}_ain_blockchain_data; tar cvf - chains snapshots | gzip -c > ~/${SEASON}_ain_blockchain_data.tar.gz'"
84+
TGZ_CMD="ssh -v $node_target_addr 'sudo -S ls -la; cd /home/${SEASON}/ain_blockchain_data; tar cvf - chains snapshots | gzip -c > ~/ain_blockchain_data.tar.gz'"
8585
printf "TGZ_CMD=$TGZ_CMD\n\n"
8686
eval "echo ${node_login_pw} | sshpass -f <(printf '%s\n' ${node_login_pw}) ${TGZ_CMD}"
8787

8888
# 2. Copy tgz file from node
8989
printf "\n\n<<< Copying tgz file from node $node_index >>>\n\n"
90-
SCP_CMD="scp -rv $node_target_addr:~/${SEASON}_ain_blockchain_data.tar.gz ."
90+
SCP_CMD="scp -rv $node_target_addr:~/ain_blockchain_data.tar.gz ."
9191
printf "SCP_CMD=$SCP_CMD\n\n"
9292
eval "sshpass -f <(printf '%s\n' ${node_login_pw}) ${SCP_CMD}"
9393

9494
# 3. Clean up tgz file for node
9595
printf "\n\n<<< Cleaning up tgz file for node $node_index >>>\n\n"
96-
CLEANUP_CMD="ssh -v $node_target_addr 'rm ~/${SEASON}_ain_blockchain_data.tar.gz'"
96+
CLEANUP_CMD="ssh -v $node_target_addr 'rm ~/ain_blockchain_data.tar.gz'"
9797
printf "CLEANUP_CMD=$CLEANUP_CMD\n\n"
98-
eval "echo ${node_login_pw} | sshpass -f <(printf '%s\n' ${node_login_pw}) ${CLEANUP_CMD}"
98+
eval "sshpass -f <(printf '%s\n' ${node_login_pw}) ${CLEANUP_CMD}"
9999
}
100100

101101
function upload_data() {
@@ -109,21 +109,21 @@ function upload_data() {
109109

110110
# 1. Copy tgz file to node
111111
printf "\n\n<<< Copying tgz file to node $node_index >>>\n\n"
112-
SCP_CMD="scp -rv ./${SEASON}_ain_blockchain_data.tar.gz $node_target_addr:~"
112+
SCP_CMD="scp -rv ./ain_blockchain_data.tar.gz $node_target_addr:~"
113113
printf "SCP_CMD=$SCP_CMD\n\n"
114114
eval "sshpass -f <(printf '%s\n' ${node_login_pw}) ${SCP_CMD}"
115115

116116
# 2. Extract tgz file for node
117117
printf "\n\n<<< Extracting tgz file for node $node_index >>>\n\n"
118-
TGZ_CMD="ssh -v $node_target_addr 'cd /home; sudo mkdir -p ${SEASON}_ain_blockchain_data; sudo chown runner:runner ${SEASON}_ain_blockchain_data; sudo chmod 777 ${SEASON}_ain_blockchain_data; cd ${SEASON}_ain_blockchain_data; gzip -dc ~/${SEASON}_ain_blockchain_data.tar.gz | tar xvf -'"
118+
TGZ_CMD="ssh -v $node_target_addr 'sudo -S ls -la; cd /home; sudo mkdir -p ${SEASON}/ain_blockchain_data; sudo chown $ONPREM_USER:$ONPREM_USER ${SEASON} ${SEASON}/ain_blockchain_data; sudo chmod 777 ${SEASON} ${SEASON}/ain_blockchain_data; cd ${SEASON}/ain_blockchain_data; gzip -dc ~/ain_blockchain_data.tar.gz | tar xvf -'"
119119
printf "TGZ_CMD=$TGZ_CMD\n\n"
120120
eval "echo ${node_login_pw} | sshpass -f <(printf '%s\n' ${node_login_pw}) ${TGZ_CMD}"
121121

122122
# 3. Clean up tgz file for node
123123
printf "\n\n<<< Cleaning up tgz file for node $node_index >>>\n\n"
124-
CLEANUP_CMD="ssh -v $node_target_addr 'rm ~/${SEASON}_ain_blockchain_data.tar.gz'"
124+
CLEANUP_CMD="ssh -v $node_target_addr 'rm ~/ain_blockchain_data.tar.gz'"
125125
printf "CLEANUP_CMD=$CLEANUP_CMD\n\n"
126-
eval "echo ${node_login_pw} | sshpass -f <(printf '%s\n' ${node_login_pw}) ${CLEANUP_CMD}"
126+
eval "sshpass -f <(printf '%s\n' ${node_login_pw}) ${CLEANUP_CMD}"
127127
}
128128

129129
if [[ "$COMMAND" = 'upload' ]]; then

‎deploy_blockchain_genesis_onprem.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ if [[ $KEEP_CODE_OPTION = "--no-keep-code" ]]; then
248248
printf "NODE_TARGET_ADDR=${NODE_TARGET_ADDR}\n"
249249

250250
printf "\n* >> Deploying files for parent node $node_index (${NODE_TARGET_ADDR}) *********************************************************\n\n"
251-
sshpass -f <(printf '%s\n' ${NODE_LOGIN_PW}) scp -rv $FILES_FOR_NODE ${NODE_TARGET_ADDR}:~/${SEASON}-ain-blockchain/
251+
sshpass -f <(printf '%s\n' ${NODE_LOGIN_PW}) scp -rv $FILES_FOR_NODE ${NODE_TARGET_ADDR}:~/ain-blockchain/
252252
done
253253
fi
254254
fi
@@ -273,7 +273,7 @@ if [[ $SETUP_OPTION = "--setup" ]]; then
273273
printf "NODE_TARGET_ADDR=${NODE_TARGET_ADDR}\n"
274274

275275
printf "\n* >> Setting up parent node $node_index (${NODE_TARGET_ADDR}) *********************************************************\n\n"
276-
echo ${NODE_LOGIN_PW} | sshpass -f <(printf '%s\n' ${NODE_LOGIN_PW}) ssh -v ${NODE_TARGET_ADDR} "cd ./${SEASON}-ain-blockchain; . setup_blockchain_ubuntu_onprem.sh"
276+
echo ${NODE_LOGIN_PW} | sshpass -f <(printf '%s\n' ${NODE_LOGIN_PW}) ssh -v ${NODE_TARGET_ADDR} "cd ./ain-blockchain; . setup_blockchain_ubuntu_onprem.sh"
277277
done
278278
fi
279279
fi
@@ -298,7 +298,7 @@ if [[ $KEEP_CODE_OPTION = "--no-keep-code" ]]; then
298298
printf "NODE_TARGET_ADDR=${NODE_TARGET_ADDR}\n"
299299

300300
printf "\n* >> Installing node modules for parent node $node_index (${NODE_TARGET_ADDR}) *********************************************************\n\n"
301-
sshpass -f <(printf '%s\n' ${NODE_LOGIN_PW}) ssh -v ${NODE_TARGET_ADDR} "cd ./${SEASON}-ain-blockchain; yarn install --ignore-engines"
301+
sshpass -f <(printf '%s\n' ${NODE_LOGIN_PW}) ssh -v ${NODE_TARGET_ADDR} "cd ./ain-blockchain; yarn install --ignore-engines"
302302
done
303303
fi
304304
fi
@@ -339,9 +339,9 @@ fi
339339

340340
printf "\nStarting blockchain servers...\n\n"
341341
if [[ $KEEP_CODE_OPTION = "--no-keep-code" ]]; then
342-
GO_TO_PROJECT_ROOT_CMD="cd ./${SEASON}-ain-blockchain"
342+
GO_TO_PROJECT_ROOT_CMD="cd ./ain-blockchain"
343343
else
344-
GO_TO_PROJECT_ROOT_CMD="cd \$(find /home/${SEASON}-ain-blockchain* -maxdepth 0 -type d)"
344+
GO_TO_PROJECT_ROOT_CMD="cd \$(find /home/${SEASON}/ain-blockchain* -maxdepth 0 -type d)"
345345
fi
346346

347347
#START_TRACKER_CMD_BASE="$GO_TO_PROJECT_ROOT_CMD && . start_tracker_genesis_gcp.sh"
@@ -376,9 +376,9 @@ if [[ $begin_index -le $PARENT_NODE_INDEX_END ]] && [[ $PARENT_NODE_INDEX_END -g
376376
if [[ $KEEP_DATA_OPTION = "--no-keep-data" ]]; then
377377
printf "\n* >> Removing old data for parent node $node_index (${NODE_TARGET_ADDR}) *********************************************************\n\n"
378378

379-
CHAINS_DIR=/home/${SEASON}_ain_blockchain_data/chains
380-
SNAPSHOTS_DIR=/home/${SEASON}_ain_blockchain_data/snapshots
381-
LOGS_DIR=/home/${SEASON}_ain_blockchain_data/logs
379+
CHAINS_DIR=/home/${SEASON}/ain_blockchain_data/chains
380+
SNAPSHOTS_DIR=/home/${SEASON}/ain_blockchain_data/snapshots
381+
LOGS_DIR=/home/${SEASON}/ain_blockchain_data/logs
382382
echo ${NODE_LOGIN_PW} | sshpass -f <(printf '%s\n' ${NODE_LOGIN_PW}) ssh -v ${NODE_TARGET_ADDR} "sudo -S rm -rf $CHAINS_DIR $SNAPSHOTS_DIR $LOGS_DIR"
383383
fi
384384

‎start_node_genesis_onprem.sh

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ function parse_options() {
5858

5959
# Parse options.
6060
SEASON="$1"
61-
GCP_USER="$2"
61+
ONPREM_USER="$2"
6262

6363
number_re='^[0-9]+$'
6464
if ! [[ $3 =~ $number_re ]] ; then
@@ -95,7 +95,7 @@ while [ $ARG_INDEX -le $# ]; do
9595
done
9696

9797
printf "SEASON=$SEASON\n"
98-
printf "GCP_USER=$GCP_USER\n"
98+
printf "ONPREM_USER=$ONPREM_USER\n"
9999
printf "SHARD_INDEX=$SHARD_INDEX\n"
100100
printf "NODE_INDEX=$NODE_INDEX\n"
101101
printf "\n"
@@ -178,35 +178,35 @@ sudo killall "client/${SEASON}-ain-blockchain-index.js"
178178
if [[ $KEEP_CODE_OPTION = "--no-keep-code" ]]; then
179179
printf '\n'
180180
printf 'Setting up new working directory..\n'
181-
sudo rm -rf /home/${SEASON}-ain-blockchain*
181+
sudo rm -rf /home/${SEASON}/ain-blockchain*
182182
# NOTE(platfowner): Add $SEASON to the node job name to be selectively killed in restarts.
183-
CODE_CMD="cd ~; sudo mv ${SEASON}-ain-blockchain /home; sudo chmod -R 777 /home/${SEASON}-ain-blockchain; sudo chown -R $GCP_USER:$GCP_USER /home/${SEASON}-ain-blockchain; cd /home/${SEASON}-ain-blockchain; mv client/index.js client/${SEASON}-ain-blockchain-index.js"
183+
CODE_CMD="sudo mkdir -p /home/${SEASON}; sudo chmod -R 777 /home/${SEASON}; sudo chown -R $ONPREM_USER:$ONPREM_USER /home/${SEASON}; cd ~; sudo mv ./ain-blockchain /home/${SEASON}; sudo chmod -R 777 /home/${SEASON}/ain-blockchain; sudo chown -R $ONPREM_USER:$ONPREM_USER /home/${SEASON}/ain-blockchain; cd /home/${SEASON}/ain-blockchain; mv client/index.js client/${SEASON}-ain-blockchain-index.js"
184184
printf "\nCODE_CMD=$CODE_CMD\n"
185185
eval $CODE_CMD
186186
else
187187
printf '\n'
188188
printf 'Reusing existing working directory..\n'
189-
OLD_DIR_PATH=$(find /home/${SEASON}-ain-blockchain* -maxdepth 0 -type d)
189+
OLD_DIR_PATH=$(find /home/${SEASON}/ain-blockchain* -maxdepth 0 -type d)
190190
printf "OLD_DIR_PATH=$OLD_DIR_PATH\n"
191-
CODE_CMD="sudo chmod -R 777 $OLD_DIR_PATH; sudo chown -R $GCP_USER:$GCP_USER $OLD_DIR_PATH"
191+
CODE_CMD="sudo chmod -R 777 $OLD_DIR_PATH; sudo chown -R $ONPREM_USER:$ONPREM_USER $OLD_DIR_PATH"
192192
printf "\nCODE_CMD=$CODE_CMD\n"
193193
eval $CODE_CMD
194194
fi
195195
if [[ $KEEP_DATA_OPTION = "--no-keep-data" ]]; then
196196
printf '\n'
197197
printf 'Setting up new data directory..\n'
198-
sudo rm -rf /home/${SEASON}_ain_blockchain_data/chains
199-
sudo rm -rf /home/${SEASON}_ain_blockchain_data/snapshots
200-
sudo rm -rf /home/${SEASON}_ain_blockchain_data/logs
201-
DATA_CMD="sudo mkdir -p /home/${SEASON}_ain_blockchain_data; sudo chmod -R 777 /home/${SEASON}_ain_blockchain_data; sudo chown -R $GCP_USER:$GCP_USER /home/${SEASON}_ain_blockchain_data"
198+
sudo rm -rf /home/${SEASON}/ain_blockchain_data/chains
199+
sudo rm -rf /home/${SEASON}/ain_blockchain_data/snapshots
200+
sudo rm -rf /home/${SEASON}/ain_blockchain_data/logs
201+
DATA_CMD="sudo mkdir -p /home/${SEASON}/ain_blockchain_data; sudo chmod -R 777 /home/${SEASON}/ain_blockchain_data; sudo chown -R $ONPREM_USER:$ONPREM_USER /home/${SEASON}/ain_blockchain_data"
202202
printf "\nDATA_CMD=$DATA_CMD\n"
203203
eval $DATA_CMD
204204
else
205205
printf 'Reusing existing data directory..\n'
206206
if [[ $CHOWN_DATA_OPTION = "--no-chown-data" ]]; then
207-
DATA_CMD="sudo mkdir -p /home/${SEASON}_ain_blockchain_data; sudo chmod 777 /home/${SEASON}_ain_blockchain_data; sudo chown $GCP_USER:$GCP_USER /home/${SEASON}_ain_blockchain_data"
207+
DATA_CMD="sudo mkdir -p /home/${SEASON}/ain_blockchain_data; sudo chmod 777 /home/${SEASON}/ain_blockchain_data; sudo chown $ONPREM_USER:$ONPREM_USER /home/${SEASON}/ain_blockchain_data"
208208
else
209-
DATA_CMD="sudo mkdir -p /home/${SEASON}_ain_blockchain_data; sudo chmod -R 777 /home/${SEASON}_ain_blockchain_data; sudo chown -R $GCP_USER:$GCP_USER /home/${SEASON}_ain_blockchain_data"
209+
DATA_CMD="sudo mkdir -p /home/${SEASON}/ain_blockchain_data; sudo chmod -R 777 /home/${SEASON}/ain_blockchain_data; sudo chown -R $ONPREM_USER:$ONPREM_USER /home/${SEASON}/ain_blockchain_data"
210210
fi
211211
printf "\nDATA_CMD=$DATA_CMD\n"
212212
eval $DATA_CMD
@@ -329,7 +329,7 @@ printf "LOG_BANDAGE_INFO=$LOG_BANDAGE_INFO\n"
329329
export HOSTING_ENV="comcom"
330330
printf "HOSTING_ENV=$HOSTING_ENV\n"
331331
# on-premise nodes run with a blockchain data directory prefixed by ${SEASON}_
332-
export BLOCKCHAIN_DATA_DIR="/home/${SEASON}_ain_blockchain_data"
332+
export BLOCKCHAIN_DATA_DIR="/home/${SEASON}/ain_blockchain_data"
333333
printf "BLOCKCHAIN_DATA_DIR=$BLOCKCHAIN_DATA_DIR\n"
334334

335335
if [[ "$SEASON" = "sandbox" ]]; then

0 commit comments

Comments
 (0)