Merge branch 'master' into dmius-text-dump

Author: dmius

nancy_run.sh

@@ -236,8 +236,13 @@ while true; do
         TMP_PATH="$2"; shift 2 ;;
     --debug-timeout )
         DEBUG_TIMEOUT="$2"; shift 2 ;;
-    -- ) shift; break ;;
-    * ) break ;;
+    -- )
+        >&2 echo "ERROR: Invalid option '$1'"
+        exit 1;
+        break ;;
+    * )
+        [ "$1" != "" ] && >&2 echo "ERROR: Invalid option '$1'. Please verify command options." && exit 1;
+    break ;;
   esac
 done
 
@@ -329,6 +334,13 @@ function checkParams() {
       >&2 echo "ERROR: AWS EC2 Instance type not given."
       exit 1
     fi
+  elif [ "$RUN_ON" = "localhost" ]; then
+    if [ ! -z ${AWS_KEY_PAIR+x} ] || [ ! -z ${AWS_KEY_PATH+x} ] ; then
+      >&2 echo "WARNING: AWS keys given but run-on option has value 'localhost'."
+    fi
+    if [ ! -z ${AWS_EC2_TYPE+x} ]; then
+      >&2 echo "WARNING: AWS instance type given but run-on option has value 'localhost'."
+    fi
   fi
 
   if [ -z ${PG_VERSION+x} ]

tests/nancy_run_invalid_aws_option.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+output=$(${BASH_SOURCE%/*}/../nancy run --run-on localhost --aws-keypair-name awskey --aws-ssh-key-path /path/.ssh/awskey.pem --aws-ec2-type i3.large 2>&1)
+
+if [[ $output =~ "WARNING: AWS keys given but run-on option has value 'localhost'." ]] && [[ $output =~ "WARNING: AWS instance type given but run-on option has value 'localhost'." ]]; then
+  echo -e "\e[36mOK\e[39m"
+else
+  >&2 echo -e "\e[31mFAILED\e[39m"
+  >&2 echo -e "Output: $output"
+  exit 1
+fi

tests/nancy_run_invalid_option.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+output=$(${BASH_SOURCE%/*}/../nancy run --run-on-type test 2>&1)
+
+if [[ $output =~ "ERROR: Invalid option '--run-on-type'. Please verify command options." ]]; then
+  echo -e "\e[36mOK\e[39m"
+else
+  >&2 echo -e "\e[31mFAILED\e[39m"
+  >&2 echo -e "Output: $output"
+  exit 1
+fi

tests/nancy_run_options_ddl_do+_undo-.sh

@@ -8,7 +8,7 @@ read -r -d '' params <<PARAMS
   --workload-full-path "s3://somebucket/db.sql.30min.pgreplay" \
   --tmp-path tmp \
   --db-dump-path "s3://somebucket/dump.sql.bz2" \
-  --target-ddl-do "create index i_zzz on sometable(col1);"
+  --target-ddl-do "create\tindex\ti_zzz\ton\tsometable(col1);"
 PARAMS
 
 output=$(${BASH_SOURCE%/*}/../nancy_run.sh $params 2>&1)

tests/nancy_run_options_ddl_do-_undo+.sh

@@ -8,7 +8,7 @@ read -r -d '' params <<PARAMS
   --workload-full-path "s3://somebucket/db.sql.30min.pgreplay" \
   --tmp-path tmp \
   --db-dump-path "s3://somebucket/dump.sql.bz2" \
-  --target-ddl-undo "drop index i_zzz;"
+  --target-ddl-undo "drop\tindex\ti_zzz;"
 PARAMS
 
 output=$(${BASH_SOURCE%/*}/../nancy_run.sh $params 2>&1)

tests/nancy_run_options_multi_workloads.sh

@@ -6,7 +6,7 @@ read -r -d '' params <<PARAMS
   --aws-ec2-type "r4.large" \
   --s3cfg-path "/home/someuser/.s3cfg" \
   --workload-full-path "s3://somebucket/db.sql.30min.pgreplay" \
-  --workload-custom-sql "select now();" \
+  --workload-custom-sql "select\tnow();" \
   --tmp-path tmp \
   --db-dump-path "s3://somebucket/dump.sql.bz2"
 PARAMS