Use high speed drives + some improvements

Author: dmius

nancy_run.sh

@@ -281,7 +281,6 @@ function checkPath() {
   if [[ $path =~ "file:///" ]]
   then
     path=${path/file:\/\//}
-    echo "CHECK $path"
     if [ -f $path ]
     then
       eval "$1=\"$path\"" # update original variable
@@ -662,14 +661,14 @@ elif [[ "$RUN_ON" = "aws" ]]; then
     >&2 echo "Failed: Docker $DOCKER_MACHINE is NOT running."
     exit 1;
   fi
-
   echo "Docker $DOCKER_MACHINE is running."
 
+  echo "Attempt use high speed disk"
+  docker-machine ssh $DOCKER_MACHINE "sudo sh -c \"mkdir /home/storage\""
   if [ ${AWS_EC2_TYPE:0:2} == 'i3' ]
   then
     # Init i3 storage, just mount existing volume
     echo "Attach i3 nvme volume"
-    docker-machine ssh $DOCKER_MACHINE df -h
     docker-machine ssh $DOCKER_MACHINE sudo add-apt-repository -y ppa:sbates
     docker-machine ssh $DOCKER_MACHINE sudo apt-get update || :
     docker-machine ssh $DOCKER_MACHINE sudo apt-get install -y nvme-cli
@@ -683,23 +682,18 @@ elif [[ "$RUN_ON" = "aws" ]]; then
 
     docker-machine ssh $DOCKER_MACHINE sudo sfdisk /dev/nvme0n1 < /tmp/nvme.part
     docker-machine ssh $DOCKER_MACHINE sudo mkfs -t ext4 /dev/nvme0n1p1
-    docker-machine ssh $DOCKER_MACHINE "sudo sh -c \"mkdir /home/storage\""
     docker-machine ssh $DOCKER_MACHINE sudo mount /dev/nvme0n1p1 /home/storage
-#    docker-machine ssh $DOCKER_MACHINE "sudo sh -c \"echo 'Check mount storage TEST' > /home/storage/nvme0n1p1-test.txt\""
-    docker-machine ssh $DOCKER_MACHINE df -h
   else
     # Create new volume and attach them for non i3 instances if need
     if [ ! -z ${EBS_SIZE+x} ]; then
       echo "Create and attach EBS volume"
       [ $DEBUG -eq 1 ] && echo "Create volume with size: $EBS_SIZE Gb"
-      VOLUME_ID=$(aws ec2 create-volume --size 10 --region us-east-1 --availability-zone us-east-1a --volume-type gp2 | jq -r .VolumeId)
+      VOLUME_ID=$(aws ec2 create-volume --size $EBS_SIZE --region us-east-1 --availability-zone us-east-1a --volume-type gp2 | jq -r .VolumeId)
       INSTANCE_ID=$(docker-machine ssh $DOCKER_MACHINE curl -s http://169.254.169.254/latest/meta-data/instance-id)
       sleep 10 # wait to volume will ready
       attachResult=$(aws ec2 attach-volume --device /dev/xvdf --volume-id $VOLUME_ID --instance-id $INSTANCE_ID --region us-east-1)
       docker-machine ssh $DOCKER_MACHINE sudo mkfs.ext4 /dev/xvdf
-      docker-machine ssh $DOCKER_MACHINE "sudo sh -c \"mkdir /home/storage\""
       docker-machine ssh $DOCKER_MACHINE sudo mount /dev/xvdf /home/storage
-      #    docker-machine ssh $DOCKER_MACHINE "sudo sh -c \"echo 'Check mount storage TEST' > /home/storage/xvdf-test.txt\""
     fi
   fi
 
@@ -720,8 +714,20 @@ alias docker_exec='docker $dockerConfig exec -i ${containerHash} '
 
 MACHINE_HOME="/machine_home/nancy_${containerHash}"
 docker_exec sh -c "mkdir $MACHINE_HOME && chmod a+w $MACHINE_HOME"
-
-#docker_exec bash -c "ls -al /storage/"
+docker_exec bash -c "ln -s /storage/ $MACHINE_HOME/storage"
+MACHINE_HOME="/machine_home/nancy_${containerHash}/storage"
+docker_exec sh -c "chmod a+w $MACHINE_HOME"
+docker_exec sh -c "chmod a+w /storage"
+
+echo "Move posgresql to high speed disk"
+docker_exec bash -c "sudo /etc/init.d/postgresql stop"
+sleep 2 # wait for postgres stopped
+docker_exec bash -c "sudo mkdir /storage/postgresql"
+docker_exec bash -c "sudo mv /var/lib/postgresql/* /storage/postgresql"
+docker_exec bash -c "rm -R /var/lib/postgresql"
+docker_exec bash -c "ln -s /storage/postgresql /var/lib/postgresql"
+docker_exec bash -c "sudo /etc/init.d/postgresql start"
+sleep 2 # wait for postgres started
 
 function copyFile() {
   if [ "$1" != '' ]; then
@@ -733,7 +739,7 @@ function copyFile() {
         # TODO: option – hard links OR regular `cp`
         docker cp ${1/file:\/\//} $containerHash:$MACHINE_HOME/
       elif [ "$RUN_ON" = "aws" ]; then
-        docker-machine scp $1 $DOCKER_MACHINE:/home/ubuntu/nancy_${containerHash}
+        docker-machine scp $1 $DOCKER_MACHINE:/home/storage
       else
         >&2 echo "ASSERT: must not reach this point"
         exit 1
@@ -756,24 +762,21 @@ function copyFile() {
 # Dump
 sleep 2 # wait for postgres up&running
 DB_DUMP_FILENAME=$(basename $DB_DUMP_PATH)
-docker_exec bash -c "bzcat $MACHINE_HOME/$DB_DUMP_FILENAME | psql --set ON_ERROR_STOP=on -U postgres test"
+echo "Restore database dump"
+docker_exec bash -c "bzcat $MACHINE_HOME/$DB_DUMP_FILENAME | psql -E --set ON_ERROR_STOP=on -U postgres test > /dev/null"
 # After init database sql code apply
 echo "Apply sql code after db init"
 if ([ ! -z ${AFTER_DB_INIT_CODE+x} ] && [ "$AFTER_DB_INIT_CODE" != "" ])
 then
   AFTER_DB_INIT_CODE_FILENAME=$(basename $AFTER_DB_INIT_CODE)
-  if [[ $AFTER_DB_INIT_CODE =~ "s3://" ]]; then
-    docker_exec s3cmd sync $AFTER_DB_INIT_CODE $MACHINE_HOME/
-  else
-    docker-machine scp $AFTER_DB_INIT_CODE $DOCKER_MACHINE:/home/ubuntu/nancy_$containerHash
-  fi
-  docker_exec bash -c "psql -U postgres test -E -f $MACHINE_HOME/$AFTER_DB_INIT_CODE_FILENAME"
+  copyFile $AFTER_DB_INIT_CODE
+  docker_exec bash -c "psql -U postgres test -b -f $MACHINE_HOME/$AFTER_DB_INIT_CODE_FILENAME"
 fi
 # Apply DDL code
 echo "Apply DDL SQL code"
 if ([ ! -z ${TARGET_DDL_DO+x} ] && [ "$TARGET_DDL_DO" != "" ]); then
   TARGET_DDL_DO_FILENAME=$(basename $TARGET_DDL_DO)
-  docker_exec bash -c "psql -U postgres test -E -f $MACHINE_HOME/$TARGET_DDL_DO_FILENAME"
+  docker_exec bash -c "psql -U postgres test -b -f $MACHINE_HOME/$TARGET_DDL_DO_FILENAME"
 fi
 # Apply initial postgres configuration
 echo "Apply initial postgres configuration"
@@ -818,26 +821,26 @@ docker_exec bash -c "/root/pgbadger/pgbadger \
   --prefix '%t [%p]: [%l-1] db=%d,user=%u (%a,%h)' /var/log/postgresql/* -f stderr \
   -o $MACHINE_HOME/$ARTIFACTS_FILENAME.json"
 
-echo "Save JSON log..."
+logpath=$( \
+  docker_exec bash -c "psql -XtU postgres \
+    -c \"select string_agg(setting, '/' order by name) from pg_settings where name in ('log_directory', 'log_filename');\" \
+    | grep / | sed -e 's/^[ \t]*//'"
+)
+docker_exec bash -c "gzip -c $logpath > $MACHINE_HOME/$ARTIFACTS_FILENAME.log.gz"
+echo "Save artifcats..."
 if [[ $ARTIFACTS_DESTINATION =~ "s3://" ]]; then
-    docker_exec s3cmd put /$MACHINE_HOME/$ARTIFACTS_FILENAME.json \
-      $ARTIFACTS_DESTINATION/
+    docker_exec s3cmd put /$MACHINE_HOME/$ARTIFACTS_FILENAME.json $ARTIFACTS_DESTINATION/
+    docker_exec s3cmd put /$MACHINE_HOME/$ARTIFACTS_FILENAME.log.gz $ARTIFACTS_DESTINATION/
 else
-    logpath=$( \
-      docker_exec bash -c "psql -XtU postgres \
-        -c \"select string_agg(setting, '/' order by name) from pg_settings where name in ('log_directory', 'log_filename');\" \
-        | grep / | sed -e 's/^[ \t]*//'"
-    )
-    docker_exec bash -c "gzip -c $logpath > $MACHINE_HOME/$ARTIFACTS_FILENAME.log.gz"
     if [ "$RUN_ON" = "localhost" ]; then
       docker cp $containerHash:$MACHINE_HOME/$ARTIFACTS_FILENAME.json $ARTIFACTS_DESTINATION/
       docker cp $containerHash:$MACHINE_HOME/$ARTIFACTS_FILENAME.log.gz $ARTIFACTS_DESTINATION/
       # TODO option: ln / cp
       #cp "$TMP_PATH/nancy_$containerHash/"$ARTIFACTS_FILENAME.json $ARTIFACTS_DESTINATION/
       #cp "$TMP_PATH/nancy_$containerHash/"$ARTIFACTS_FILENAME.log.gz $ARTIFACTS_DESTINATION/
     elif [ "$RUN_ON" = "aws" ]; then
-      docker-machine scp $DOCKER_MACHINE:/home/ubuntu/nancy_$containerHash/$ARTIFACTS_FILENAME.json $ARTIFACTS_DESTINATION/
-      docker-machine scp $DOCKER_MACHINE:/home/ubuntu/nancy_$containerHash/$ARTIFACTS_FILENAME.log.gz $ARTIFACTS_DESTINATION/
+      docker-machine scp $DOCKER_MACHINE:/home/storage/$ARTIFACTS_FILENAME.json $ARTIFACTS_DESTINATION/
+      docker-machine scp $DOCKER_MACHINE:/home/storage/$ARTIFACTS_FILENAME.log.gz $ARTIFACTS_DESTINATION/
     else
       >&2 echo "ASSERT: must not reach this point"
       exit 1
@@ -847,18 +850,18 @@ fi
 echo "Apply DDL undo SQL code"
 if ([ ! -z ${TARGET_DDL_UNDO+x} ] && [ "$TARGET_DDL_UNDO" != "" ]); then
     TARGET_DDL_UNDO_FILENAME=$(basename $TARGET_DDL_UNDO)
-    docker_exec bash -c "psql -U postgres test -E -f $MACHINE_HOME/$TARGET_DDL_UNDO_FILENAME"
+    docker_exec bash -c "psql -U postgres test -b -f $MACHINE_HOME/$TARGET_DDL_UNDO_FILENAME"
 fi
 
 echo -e "Run done!"
 echo -e "Report: $ARTIFACTS_DESTINATION/$ARTIFACTS_FILENAME.json"
 echo -e "Query log: $ARTIFACTS_DESTINATION/$ARTIFACTS_FILENAME.log.gz"
 echo -e "-------------------------------------------"
 echo -e "Summary:"
-echo -e "  Queries duration:\t\t" $(cat $ARTIFACTS_DESTINATION/$ARTIFACTS_FILENAME.json | jq '.overall_stat.queries_duration') " ms"
-echo -e "  Queries count:\t\t" $(cat $ARTIFACTS_DESTINATION/$ARTIFACTS_FILENAME.json | jq '.overall_stat.queries_number')
-echo -e "  Normalized queries count:\t" $(cat $ARTIFACTS_DESTINATION/$ARTIFACTS_FILENAME.json | jq '.normalyzed_info| length')
-echo -e "  Errors count:\t\t\t" $(cat $ARTIFACTS_DESTINATION/$ARTIFACTS_FILENAME.json | jq '.overall_stat.errors_number')
+echo -e "  Queries duration:\t\t" $(docker_exec cat /$MACHINE_HOME/$ARTIFACTS_FILENAME.json | jq '.overall_stat.queries_duration') " ms"
+echo -e "  Queries count:\t\t" $( docker_exec cat /$MACHINE_HOME/$ARTIFACTS_FILENAME.json | jq '.overall_stat.queries_number')
+echo -e "  Normalized queries count:\t" $(docker_exec cat /$MACHINE_HOME/$ARTIFACTS_FILENAME.json | jq '.normalyzed_info| length')
+echo -e "  Errors count:\t\t\t" $(docker_exec cat /$MACHINE_HOME/$ARTIFACTS_FILENAME.json | jq '.overall_stat.errors_number')
 echo -e "-------------------------------------------"
 
 sleep $DEBUG_TIMEOUT