Skip to content

Commit f92238e

Browse files
authored
Merge pull request #1311 from ainblockchain/feature/platfowner/feature
Split code and data directories with season prefixes
2 parents 78b9c90 + 3c4bc6d commit f92238e

File tree

2 files changed

+20
-17
lines changed

2 files changed

+20
-17
lines changed

deploy_blockchain_genesis_onprem.sh

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

258258
printf "\n* >> Deploying files for parent node $node_index (${NODE_TARGET_ADDR}) *********************************************************\n\n"
259-
sshpass -f <(printf '%s\n' ${NODE_LOGIN_PW}) scp -rv $FILES_FOR_NODE ${NODE_TARGET_ADDR}:~/ain-blockchain/
259+
sshpass -f <(printf '%s\n' ${NODE_LOGIN_PW}) scp -rv $FILES_FOR_NODE ${NODE_TARGET_ADDR}:~/${SEASON}-ain-blockchain/
260260
done
261261
fi
262262
fi
@@ -281,7 +281,7 @@ if [[ $SETUP_OPTION = "--setup" ]]; then
281281
printf "NODE_TARGET_ADDR=${NODE_TARGET_ADDR}\n"
282282

283283
printf "\n* >> Setting up parent node $node_index (${NODE_TARGET_ADDR}) *********************************************************\n\n"
284-
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"
284+
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"
285285
done
286286
fi
287287
fi
@@ -306,7 +306,7 @@ if [[ $KEEP_CODE_OPTION = "--no-keep-code" ]]; then
306306
printf "NODE_TARGET_ADDR=${NODE_TARGET_ADDR}\n"
307307

308308
printf "\n* >> Installing node modules for parent node $node_index (${NODE_TARGET_ADDR}) *********************************************************\n\n"
309-
sshpass -f <(printf '%s\n' ${NODE_LOGIN_PW}) ssh -v ${NODE_TARGET_ADDR} "cd ./ain-blockchain; yarn install --ignore-engines"
309+
sshpass -f <(printf '%s\n' ${NODE_LOGIN_PW}) ssh -v ${NODE_TARGET_ADDR} "cd ./${SEASON}-ain-blockchain; yarn install --ignore-engines"
310310
done
311311
fi
312312
fi
@@ -347,9 +347,9 @@ fi
347347

348348
printf "\nStarting blockchain servers...\n\n"
349349
if [[ $KEEP_CODE_OPTION = "--no-keep-code" ]]; then
350-
GO_TO_PROJECT_ROOT_CMD="cd ./ain-blockchain"
350+
GO_TO_PROJECT_ROOT_CMD="cd ./${SEASON}-ain-blockchain"
351351
else
352-
GO_TO_PROJECT_ROOT_CMD="cd \$(find /home/ain-blockchain* -maxdepth 0 -type d)"
352+
GO_TO_PROJECT_ROOT_CMD="cd \$(find /home/${SEASON}-ain-blockchain* -maxdepth 0 -type d)"
353353
fi
354354

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

387-
CHAINS_DIR=/home/ain_blockchain_data/chains
388-
SNAPSHOTS_DIR=/home/ain_blockchain_data/snapshots
389-
LOGS_DIR=/home/ain_blockchain_data/logs
387+
CHAINS_DIR=/home/${SEASON}_ain_blockchain_data/chains
388+
SNAPSHOTS_DIR=/home/${SEASON}_ain_blockchain_data/snapshots
389+
LOGS_DIR=/home/${SEASON}_ain_blockchain_data/logs
390390
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"
391391
fi
392392

start_node_genesis_onprem.sh

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -178,14 +178,14 @@ sudo killall node
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/ain-blockchain*
182-
CODE_CMD="cd ~; sudo mv ain-blockchain /home; sudo chmod -R 777 /home/ain-blockchain; sudo chown -R $GCP_USER:$GCP_USER /home/ain-blockchain; cd /home/ain-blockchain"
181+
sudo rm -rf /home/${SEASON}-ain-blockchain*
182+
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"
183183
printf "\nCODE_CMD=$CODE_CMD\n"
184184
eval $CODE_CMD
185185
else
186186
printf '\n'
187187
printf 'Reusing existing working directory..\n'
188-
OLD_DIR_PATH=$(find /home/ain-blockchain* -maxdepth 0 -type d)
188+
OLD_DIR_PATH=$(find /home/${SEASON}-ain-blockchain* -maxdepth 0 -type d)
189189
printf "OLD_DIR_PATH=$OLD_DIR_PATH\n"
190190
CODE_CMD="sudo chmod -R 777 $OLD_DIR_PATH; sudo chown -R $GCP_USER:$GCP_USER $OLD_DIR_PATH"
191191
printf "\nCODE_CMD=$CODE_CMD\n"
@@ -194,18 +194,18 @@ fi
194194
if [[ $KEEP_DATA_OPTION = "--no-keep-data" ]]; then
195195
printf '\n'
196196
printf 'Setting up new data directory..\n'
197-
sudo rm -rf /home/ain_blockchain_data/chains
198-
sudo rm -rf /home/ain_blockchain_data/snapshots
199-
sudo rm -rf /home/ain_blockchain_data/logs
200-
DATA_CMD="sudo mkdir -p /home/ain_blockchain_data; sudo chmod -R 777 /home/ain_blockchain_data; sudo chown -R $GCP_USER:$GCP_USER /home/ain_blockchain_data"
197+
sudo rm -rf /home/${SEASON}_ain_blockchain_data/chains
198+
sudo rm -rf /home/${SEASON}_ain_blockchain_data/snapshots
199+
sudo rm -rf /home/${SEASON}_ain_blockchain_data/logs
200+
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"
201201
printf "\nDATA_CMD=$DATA_CMD\n"
202202
eval $DATA_CMD
203203
else
204204
printf 'Reusing existing data directory..\n'
205205
if [[ $CHOWN_DATA_OPTION = "--no-chown-data" ]]; then
206-
DATA_CMD="sudo mkdir -p /home/ain_blockchain_data; sudo chmod 777 /home/ain_blockchain_data; sudo chown $GCP_USER:$GCP_USER /home/ain_blockchain_data"
206+
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"
207207
else
208-
DATA_CMD="sudo mkdir -p /home/ain_blockchain_data; sudo chmod -R 777 /home/ain_blockchain_data; sudo chown -R $GCP_USER:$GCP_USER /home/ain_blockchain_data"
208+
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"
209209
fi
210210
printf "\nDATA_CMD=$DATA_CMD\n"
211211
eval $DATA_CMD
@@ -327,6 +327,9 @@ printf "LOG_BANDAGE_INFO=$LOG_BANDAGE_INFO\n"
327327
# on-premise nodes run with "comcom" hosting env
328328
export HOSTING_ENV="comcom"
329329
printf "HOSTING_ENV=$HOSTING_ENV\n"
330+
# on-premise nodes run with a blockchain data directory prefixed by ${SEASON}_
331+
export BLOCKCHAIN_DATA_DIR="/home/${SEASON}_ain_blockchain_data"
332+
printf "BLOCKCHAIN_DATA_DIR=$BLOCKCHAIN_DATA_DIR\n"
330333

331334
if [[ "$SEASON" = "sandbox" ]]; then
332335
MAX_OLD_SPACE_SIZE_MB=11000

0 commit comments

Comments
 (0)