diff --git a/.gitignore b/.gitignore index 9e2547227..df92b10d4 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,4 @@ __pycache__/ report.xml outputs.json builds/ -*.tfstate.backup \ No newline at end of file +*.tfstate.backup diff --git a/.gitlab/.perf-able-gitlab-ci.yml b/.gitlab/.perf-able-gitlab-ci.yml index 93165d50b..c7eacfe23 100644 --- a/.gitlab/.perf-able-gitlab-ci.yml +++ b/.gitlab/.perf-able-gitlab-ci.yml @@ -58,4 +58,4 @@ perf_able: - pipeline: $PARENT_PIPELINE_ID job: build for linux arm64 - pipeline: $PARENT_PIPELINE_ID - job: build for linux amd64 \ No newline at end of file + job: build for linux amd64 diff --git a/Dockerfile-clustertests b/Dockerfile-clustertests index a7a441112..d624d8bcc 100644 --- a/Dockerfile-clustertests +++ b/Dockerfile-clustertests @@ -14,14 +14,14 @@ RUN chmod +x /pumba # add docker client to pause/unpause nodes RUN apt update -RUN apt install -y docker.io +RUN apt install -y docker.io # add docker-compose so tests can use it for stuff ADD https://github.com/docker/compose/releases/latest/download/docker-compose-Linux-x86_64 /usr/local/bin/docker-compose RUN chmod +x /usr/local/bin/docker-compose # generate an instrumented binary to allow for calculating code coverage for clustertests -# the entrypoint for the binary is TestRunMain, which is wrapper for main +# the entrypoint for the binary is TestRunMain, which is wrapper for main RUN cd /go/src/github.com/molecula/featurebase/cmd/featurebase && \ go test -covermode=atomic -coverpkg=../../... -c -tags testrunmain -o featurebase && \ cp /go/src/github.com/molecula/featurebase/cmd/featurebase/featurebase /featurebase diff --git a/Dockerfile-clustertests-client b/Dockerfile-clustertests-client index 8e845a9f6..6c6940890 100644 --- a/Dockerfile-clustertests-client +++ b/Dockerfile-clustertests-client @@ -13,7 +13,7 @@ RUN chmod +x /pumba # add docker client to pause/unpause nodes RUN apt update -RUN apt install -y docker.io +RUN apt install -y docker.io # add docker-compose so tests can use it for stuff ADD https://github.com/docker/compose/releases/latest/download/docker-compose-Linux-x86_64 /usr/local/bin/docker-compose diff --git a/Makefile b/Makefile index 540c7ae42..564c58e59 100644 --- a/Makefile +++ b/Makefile @@ -155,7 +155,7 @@ clustertests: vendor PROJECT=$(PROJECT) $(DOCKER_COMPOSE) -f internal/clustertests/docker-compose.yml run client1 $(DOCKER_COMPOSE) -f internal/clustertests/docker-compose.yml down -# Run the cluster tests with authentication enabled +# Run the cluster tests with authentication enabled AUTH_ARGS="-c /go/src/github.com/molecula/featurebase/internal/clustertests/testdata/featurebase.conf" authclustertests: vendor CLUSTERTESTS_FB_ARGS=$(AUTH_ARGS) $(DOCKER_COMPOSE) -f internal/clustertests/docker-compose.yml down diff --git a/client/README.md b/client/README.md index 9af16df33..6b1efebc7 100644 --- a/client/README.md +++ b/client/README.md @@ -82,4 +82,4 @@ See: [Server Interaction](docs/server-interaction.md) ### Other Documentation -* [Tracing](docs/tracing.md) \ No newline at end of file +* [Tracing](docs/tracing.md) diff --git a/install/test_installation.sh b/install/test_installation.sh index 4a301ea48..abbd60754 100644 --- a/install/test_installation.sh +++ b/install/test_installation.sh @@ -2,7 +2,7 @@ tests_failed=0 # test validity of featurebase.service -systemd-analyze verify /etc/systemd/system/featurebase.service +systemd-analyze verify /etc/systemd/system/featurebase.service exit_code=$? if [ $exit_code -ne 0 ]; then echo 'featurebase.redhat.service invalid' diff --git a/internal/clustertests/docker-compose-replication2.yml b/internal/clustertests/docker-compose-replication2.yml index 2fe6992bd..d17bb0aa2 100644 --- a/internal/clustertests/docker-compose-replication2.yml +++ b/internal/clustertests/docker-compose-replication2.yml @@ -1,5 +1,5 @@ version: '2' -services: +services: pilosa1: build: context: ../.. @@ -48,5 +48,5 @@ services: - /var/run/docker.sock:/var/run/docker.sock command: - "go test -v -count=1 github.com/molecula/featurebase/internal/clustertests" -networks: +networks: pilosanet: diff --git a/internal/clustertests/docker-compose.yml b/internal/clustertests/docker-compose.yml index ee7ebc496..0a4d526b6 100644 --- a/internal/clustertests/docker-compose.yml +++ b/internal/clustertests/docker-compose.yml @@ -1,5 +1,5 @@ version: '2' -services: +services: pilosa1: build: context: ../.. @@ -16,7 +16,7 @@ services: networks: - pilosanet volumes: - - ./results:/results + - ./results:/results command: - "cd /go/src/github.com/molecula/featurebase/cmd/featurebase && /featurebase -test.run=TestRunMain -test.coverprofile=/results/coverage-server1.out server --bind pilosa1:10101 ${CLUSTERTESTS_FB_ARGS}" pilosa2: @@ -84,5 +84,5 @@ services: dockerfile: Dockerfile-fakeIDP networks: - pilosanet -networks: +networks: pilosanet: diff --git a/lattice/src/App/AuthFlow/index.ts b/lattice/src/App/AuthFlow/index.ts index 364a48925..1416c2492 100644 --- a/lattice/src/App/AuthFlow/index.ts +++ b/lattice/src/App/AuthFlow/index.ts @@ -1 +1 @@ -export * from './Signin'; \ No newline at end of file +export * from './Signin'; diff --git a/lattice/src/App/QueryBuilder/QueryBuilder.module.scss b/lattice/src/App/QueryBuilder/QueryBuilder.module.scss index 33c34ede7..5fc843187 100644 --- a/lattice/src/App/QueryBuilder/QueryBuilder.module.scss +++ b/lattice/src/App/QueryBuilder/QueryBuilder.module.scss @@ -34,7 +34,7 @@ } } -.config { +.config { padding: 24px 32px 0; flex-grow: 1; } diff --git a/pg/lookerToFeaturebase.md b/pg/lookerToFeaturebase.md index cd7c82b9b..05a639a35 100644 --- a/pg/lookerToFeaturebase.md +++ b/pg/lookerToFeaturebase.md @@ -536,7 +536,7 @@ server-->>213070643358498:-BIND COMPLETE server-->>213070643358498:-NO DATA server-->>213070643358498:-EMPTY QUERY RESPONSE server-->>213070643358498:-READY FOR QUERY type= -213070643358498->>server:+PARSE name='', num_params=0, params_type=, query=SELECT 1 +213070643358498->>server:+PARSE name='', num_params=0, params_type=, query=SELECT 1 213070643358498->>server:+BIND portal='', name='', num_formats=0, formats=, num_params=0, params= 213070643358498->>server:+DESCRIBE kind='P', name='' 213070643358498->>server:+EXECUTE name='', nb_rows=0 diff --git a/pg/lookerToPostgres.md b/pg/lookerToPostgres.md index 53ef945be..775ec79bd 100644 --- a/pg/lookerToPostgres.md +++ b/pg/lookerToPostgres.md @@ -557,7 +557,7 @@ server-->>213070643360924:-BIND COMPLETE server-->>213070643360924:-NO DATA server-->>213070643360924:-EMPTY QUERY RESPONSE server-->>213070643360924:-READY FOR QUERY type= -213070643360924->>server:+PARSE name='', num_params=0, params_type=, query=SELECT 1 +213070643360924->>server:+PARSE name='', num_params=0, params_type=, query=SELECT 1 213070643360924->>server:+BIND portal='', name='', num_formats=0, formats=, num_params=0, params= 213070643360924->>server:+DESCRIBE kind='P', name='' 213070643360924->>server:+EXECUTE name='', nb_rows=0 diff --git a/qa/scripts/auth-smoke/setup.sh b/qa/scripts/auth-smoke/setup.sh index 67016ea20..07896de26 100755 --- a/qa/scripts/auth-smoke/setup.sh +++ b/qa/scripts/auth-smoke/setup.sh @@ -49,11 +49,11 @@ DEPLOYED_INGEST_IPS_LEN=`echo "$DEPLOYED_INGEST_IPS" | wc -l` #wait until we can connect to one of the hosts for i in {0..24} -do +do ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o StrictHostKeyChecking=no -o ConnectTimeout=10 ec2-user@${DATANODE0} "pwd" if [ $? -eq 0 ] then - echo "Cluster is up after ${i} tries." + echo "Cluster is up after ${i} tries." break fi sleep 10 @@ -62,7 +62,7 @@ done ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o StrictHostKeyChecking=no -o ConnectTimeout=10 ec2-user@${DATANODE0} "pwd" if [ $? -ne 0 ] then - echo "Unable to connect to cluster - giving up" + echo "Unable to connect to cluster - giving up" exit 1 fi @@ -75,7 +75,7 @@ for i in {0..24}; do if [ $? -eq 0 ]; then echo "Cluster is up after ${i} tries" exit 0 - fi + fi sleep 1 done exit $? diff --git a/qa/scripts/auth-smoke/test.sh b/qa/scripts/auth-smoke/test.sh index 7f7c0cb93..082d81429 100755 --- a/qa/scripts/auth-smoke/test.sh +++ b/qa/scripts/auth-smoke/test.sh @@ -15,8 +15,8 @@ HOSTS=($( cat ./qa/tf/ci/auth-smoke/outputs.json | jq -r '.data_node_ips.value' echo "Copying tests to remote" scp -r -i ~/.ssh/gitlab-featurebase-ci.pem ./qa/scripts/auth-smoke/tests/ ec2-user@${INGESTNODE0}:/data scp -r -i ~/.ssh/gitlab-featurebase-ci.pem ./datagen_linux_arm64 ec2-user@${INGESTNODE0}:/data -if (( $? != 0 )) -then +if (( $? != 0 )) +then echo "Copy failed" exit 1 fi @@ -27,11 +27,11 @@ ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o "StrictHostKeyChecking no" ec2-use SMOKETESTRESULT=$? -if (( $SMOKETESTRESULT != 0 )) -then +if (( $SMOKETESTRESULT != 0 )) +then echo "smoke tests complete with test failures" else echo "smoke tests complete" fi -exit $SMOKETESTRESULT +exit $SMOKETESTRESULT diff --git a/qa/scripts/auth-smoke/tests/sup218-test.sh b/qa/scripts/auth-smoke/tests/sup218-test.sh index cd75a0c0f..0a9cd011e 100755 --- a/qa/scripts/auth-smoke/tests/sup218-test.sh +++ b/qa/scripts/auth-smoke/tests/sup218-test.sh @@ -17,17 +17,17 @@ done HOST=${HOSTS[2]} ADMIN_TOKEN="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYW1lIjoiYWRtaW4ifQ.I1iCgk1VU7m6e-En4ACTHIs6V2dZpy_8j2blSSo7K3U" -# ingest string key data to user index +# ingest string key data to user index /data/datagen --source custom --custom-config /data/tests/sup218_datagen.yaml --pilosa.index=user --pilosa.hosts=https://$HOST:10101 --pilosa.batch-size=1000 --auth-token=$ADMIN_TOKEN ifErr "running datagen on $HOST" -# install grpcurl +# install grpcurl wget https://github.com/fullstorydev/grpcurl/releases/download/v1.8.6/grpcurl_1.8.6_linux_arm64.tar.gz tar -xvf grpcurl_1.8.6_linux_arm64.tar.gz chmod +x grpcurl for ip in ${HOSTS[@]}; do - # then make a `select distinct test_field from user` + # then make a `select distinct test_field from user` ./grpcurl -H 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYW1lIjoiYWRtaW4ifQ.I1iCgk1VU7m6e-En4ACTHIs6V2dZpy_8j2blSSo7K3U' -d '{"sql": "select * from user limit 1"}' $ip:20101 pilosa.Pilosa.QuerySQL # make sure it doesn't fail ifErr "select * from user failed when it shouldn't have!" diff --git a/qa/scripts/auth-smoke/tests/sup218_datagen.yaml b/qa/scripts/auth-smoke/tests/sup218_datagen.yaml index c9b8292c5..9dafe7913 100644 --- a/qa/scripts/auth-smoke/tests/sup218_datagen.yaml +++ b/qa/scripts/auth-smoke/tests/sup218_datagen.yaml @@ -25,7 +25,7 @@ fields: max_date: 2007-01-02T15:04:05.001Z # RFC3339Nano distribution: "increasing" # only "increasing" is supported right now min_step_duration: "10ns" - max_step_duration: "200ms" + max_step_duration: "200ms" - name: "slice" type: "uint-set" # (default IDArrayField) min: 0 diff --git a/qa/scripts/backupRestoreTest.sh b/qa/scripts/backupRestoreTest.sh index 794898e41..837ccbe7d 100755 --- a/qa/scripts/backupRestoreTest.sh +++ b/qa/scripts/backupRestoreTest.sh @@ -2,13 +2,13 @@ HOSTS=($@) /data/datagen --source custom --custom-config /data/backup_test_datagen.yaml --pilosa.index=backup_test --pilosa.hosts=$HOSTS --pilosa.batch-size=1000 -# make sure backup doesn't fail +# make sure backup doesn't fail if (( $? != 0 )); then echo "datagen failed" exit 1 fi -# kill a node somehow +# kill a node somehow echo "hosts we've got" for host in ${HOSTS[@]}; do echo $host; @@ -19,22 +19,22 @@ echo "getting checksum from $KILLNODE" firstCheckSum=$(featurebase chksum --host $KILLNODE) echo "first check sum: $firstCheckSum" if (( $? != 0 )) -then +then echo "getting checksum from $KILLNODE failed" exit 1 fi echo "pausing node $KILLNODE" -ssh -A -o "StrictHostKeyChecking no" ec2-user@${KILLNODE} "sudo systemctl stop featurebase" +ssh -A -o "StrictHostKeyChecking no" ec2-user@${KILLNODE} "sudo systemctl stop featurebase" if (( $? != 0 )) -then +then echo "pausing node $KILLNODE failed" exit 1 fi # backup from ingest node featurebase backup --host=${HOSTS[2]} --retry-period=0s --output=backupWOOO -# make sure backup doesn't fail +# make sure backup doesn't fail if (( $? != 0 )); then echo "backup failed!!!!!!!!!!" exit 1 @@ -44,8 +44,8 @@ echo "stopping all featurebase nodes" # kill all featurebase nodes and wipe the data directory for host in ${HOSTS[@]}; do echo "stopping featurebase on ${host}" - ssh -A -o "StrictHostKeyChecking no" ec2-user@${host} "sudo systemctl stop featurebase && sudo find /data/featurebase/ -mindepth 1 -delete" - if (( $? != 0 )); then + ssh -A -o "StrictHostKeyChecking no" ec2-user@${host} "sudo systemctl stop featurebase && sudo find /data/featurebase/ -mindepth 1 -delete" + if (( $? != 0 )); then echo "emptying and stopping node failed" exit 1 fi @@ -55,8 +55,8 @@ echo "starting all featurebase nodes" # start all featurebase nodes - systemd for host in ${HOSTS[@]}; do echo "starting featurebase on ${host}" - ssh -A -o "StrictHostKeyChecking no" ec2-user@${host} "sudo systemctl restart featurebase" - if (( $? != 0 )); then + ssh -A -o "StrictHostKeyChecking no" ec2-user@${host} "sudo systemctl restart featurebase" + if (( $? != 0 )); then echo "restarting featurebase failed" exit 1 fi @@ -64,12 +64,12 @@ done echo "waiting for featurebase to start" # wait until we can connect to one of the hosts -for i in {0..24}; do +for i in {0..24}; do echo "checking ${HOSTS[1]}:10101/status" curl -v ${HOSTS[1]}:10101/status - S=$(curl -s ${HOSTS[1]}:10101/status | jq -r ".state"); - if [[ $S == "NORMAL" ]]; then - echo "hosts up after $i tries"; + S=$(curl -s ${HOSTS[1]}:10101/status | jq -r ".state"); + if [[ $S == "NORMAL" ]]; then + echo "hosts up after $i tries"; break; fi echo "attempt $i resulted in $S" @@ -83,7 +83,7 @@ if [[ $S != "NORMAL" ]]; then fi echo "restoring featurebase" -# featurebase restore +# featurebase restore featurebase restore -s=backupWOOO --host=${HOSTS[1]} # make sure it doesn't fail @@ -96,12 +96,12 @@ fi echo "getting checksum from $KILLNODE" secondChkSum=$(featurebase chksum --host $KILLNODE) echo "second checkSum $secondChkSum" -if (( $? != 0 )); then +if (( $? != 0 )); then echo "getting checksum from $KILLNODE failed" exit 1 fi -if [[ $firstCheckSum == $secondChkSum ]]; then +if [[ $firstCheckSum == $secondChkSum ]]; then echo "checksums match" exit 0 else @@ -109,4 +109,4 @@ else echo "second check sum $secondCheckSum" echo "check sums don't match" exit 1 -fi +fi diff --git a/qa/scripts/backup_test_datagen.yaml b/qa/scripts/backup_test_datagen.yaml index c9b8292c5..9dafe7913 100644 --- a/qa/scripts/backup_test_datagen.yaml +++ b/qa/scripts/backup_test_datagen.yaml @@ -25,7 +25,7 @@ fields: max_date: 2007-01-02T15:04:05.001Z # RFC3339Nano distribution: "increasing" # only "increasing" is supported right now min_step_duration: "10ns" - max_step_duration: "200ms" + max_step_duration: "200ms" - name: "slice" type: "uint-set" # (default IDArrayField) min: 0 diff --git a/qa/scripts/bug_repro_tests.sh b/qa/scripts/bug_repro_tests.sh index f4f868e32..d97fcc28c 100755 --- a/qa/scripts/bug_repro_tests.sh +++ b/qa/scripts/bug_repro_tests.sh @@ -14,13 +14,13 @@ echo "using DATANODE0 ${DATANODE0}" # install librdkafka ... workaround until we have static datagen builds for arm -ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o "StrictHostKeyChecking no" ec2-user@${INGESTNODE0} "sudo yum -y install librdkafka" +ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o "StrictHostKeyChecking no" ec2-user@${INGESTNODE0} "sudo yum -y install librdkafka" echo "Copying tests to remote" scp -r -i ~/.ssh/gitlab-featurebase-ci.pem ./qa/testcases/bug-repros/ ec2-user@${INGESTNODE0}:/data scp -r -i ~/.ssh/gitlab-featurebase-ci.pem ./datagen_linux_arm64 ec2-user@${INGESTNODE0}:/data -if (( $? != 0 )) -then +if (( $? != 0 )) +then echo "Copy failed" exit 1 fi @@ -31,11 +31,11 @@ ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o "StrictHostKeyChecking no" ec2-use SMOKETESTRESULT=$? -if (( $SMOKETESTRESULT != 0 )) -then +if (( $SMOKETESTRESULT != 0 )) +then echo "smoke tests complete with test failures" else echo "smoke tests complete" fi -exit $SMOKETESTRESULT +exit $SMOKETESTRESULT diff --git a/qa/scripts/perf/able/ableRun.sh b/qa/scripts/perf/able/ableRun.sh old mode 100644 new mode 100755 index 92ca26987..f8323daeb --- a/qa/scripts/perf/able/ableRun.sh +++ b/qa/scripts/perf/able/ableRun.sh @@ -3,12 +3,12 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) # requires TF_VAR_cluster_prefix env var to be set -if [ -z ${TF_VAR_cluster_prefix+x} ]; then +if [ -z ${TF_VAR_cluster_prefix+x} ]; then echo "setting TF_VAR_cluster_prefix"; export TF_VAR_cluster_prefix="able-$(openssl rand -base64 12 | tr -d /=+ | cut -c -16)" - echo "TF_VAR_cluster_prefix is set to '$TF_VAR_cluster_prefix'"; -else - echo "TF_VAR_cluster_prefix is set to '$TF_VAR_cluster_prefix'"; + echo "TF_VAR_cluster_prefix is set to '$TF_VAR_cluster_prefix'"; +else + echo "TF_VAR_cluster_prefix is set to '$TF_VAR_cluster_prefix'"; fi $SCRIPT_DIR/ableSetup.sh diff --git a/qa/scripts/perf/able/ableSetup.sh b/qa/scripts/perf/able/ableSetup.sh index 8ba9a4f54..1a72a2666 100755 --- a/qa/scripts/perf/able/ableSetup.sh +++ b/qa/scripts/perf/able/ableSetup.sh @@ -3,11 +3,11 @@ # To run script: ./ableSetup.sh export TF_IN_AUTOMATION=1 -if [ -z ${TF_VAR_cluster_prefix+x} ]; then +if [ -z ${TF_VAR_cluster_prefix+x} ]; then echo "TF_VAR_cluster_prefix is unset"; exit 1 -else - echo "TF_VAR_cluster_prefix is set to '$TF_VAR_cluster_prefix'"; +else + echo "TF_VAR_cluster_prefix is set to '$TF_VAR_cluster_prefix'"; fi SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) @@ -52,11 +52,11 @@ DEPLOYED_INGEST_IPS_LEN=`echo "$DEPLOYED_INGEST_IPS" | wc -l` #wait until we can connect to one of the hosts for i in {0..24} -do +do ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o StrictHostKeyChecking=no -o ConnectTimeout=10 ec2-user@${DATANODE0} "pwd" if [ $? -eq 0 ] then - echo "Cluster is up after ${i} tries." + echo "Cluster is up after ${i} tries." break fi sleep 10 @@ -65,7 +65,7 @@ done ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o StrictHostKeyChecking=no -o ConnectTimeout=10 ec2-user@${DATANODE0} "pwd" if [ $? -ne 0 ] then - echo "Unable to connect to cluster - giving up" + echo "Unable to connect to cluster - giving up" exit 1 fi @@ -74,8 +74,8 @@ setupClusterNodes # verify featurebase running echo "Verifying featurebase cluster running..." curl -s http://${DATANODE0}:10101/status -if (( $? != 0 )) -then +if (( $? != 0 )) +then echo "Featurebase cluster not running" exit 1 fi diff --git a/qa/scripts/perf/able/ableTest.sh b/qa/scripts/perf/able/ableTest.sh index d81ec2f51..282bf3d7a 100755 --- a/qa/scripts/perf/able/ableTest.sh +++ b/qa/scripts/perf/able/ableTest.sh @@ -16,35 +16,35 @@ echo "using DATANODE0 ${DATANODE0}" echo "Copying tests to remote" scp -r -i ~/.ssh/gitlab-featurebase-ci.pem ./qa/scripts/perf/able/*.js ec2-user@${INGESTNODE0}:/data -if (( $? != 0 )) -then +if (( $? != 0 )) +then echo "Copy failed" exit 1 fi # copy restore data to ingest node echo "Copying restore data from S3" -ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o "StrictHostKeyChecking no" ec2-user@${INGESTNODE0} "aws s3 cp s3://molecula-perf-storage/able/perf-able-seg.tar.xz /data/perf-able-seg.tar.xz --no-progress" -if (( $? != 0 )) -then +ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o "StrictHostKeyChecking no" ec2-user@${INGESTNODE0} "aws s3 cp s3://molecula-perf-storage/able/perf-able-seg.tar.xz /data/perf-able-seg.tar.xz --no-progress" +if (( $? != 0 )) +then echo "Copy failed" exit 1 fi # untar data echo "Untarring data" -ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o "StrictHostKeyChecking no" ec2-user@${INGESTNODE0} "cd /data; tar -xf perf-able-seg.tar.xz" -if (( $? != 0 )) -then +ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o "StrictHostKeyChecking no" ec2-user@${INGESTNODE0} "cd /data; tar -xf perf-able-seg.tar.xz" +if (( $? != 0 )) +then echo "Untarring failed" exit 1 fi # restore data echo "Restoring data" -ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o "StrictHostKeyChecking no" ec2-user@${INGESTNODE0} "cd /data; featurebase restore --host http://${DATANODE0}:10101 -s /data/data/backup > restore.out" -if (( $? != 0 )) -then +ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o "StrictHostKeyChecking no" ec2-user@${INGESTNODE0} "cd /data; featurebase restore --host http://${DATANODE0}:10101 -s /data/data/backup > restore.out" +if (( $? != 0 )) +then echo "Restoring failed" exit 1 fi @@ -52,15 +52,15 @@ fi # run test echo "Running perf test" # leaving this here because K6 is timing out and need to work out why -#ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o "StrictHostKeyChecking no" ec2-user@${INGESTNODE0} "/home/ec2-user/bin/k6 run -e DATANODE0=test.k6.io /data/highcardinalitygroupby.js" -ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o "StrictHostKeyChecking no" ec2-user@${INGESTNODE0} "curl ${DATANODE0}:10101/index/seg/query -X POST -o /data/response.json -d 'GroupBy(Rows(education_level), Rows(gender), Rows(domain), aggregate=Sum(field=age))'" +#ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o "StrictHostKeyChecking no" ec2-user@${INGESTNODE0} "/home/ec2-user/bin/k6 run -e DATANODE0=test.k6.io /data/highcardinalitygroupby.js" +ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o "StrictHostKeyChecking no" ec2-user@${INGESTNODE0} "curl ${DATANODE0}:10101/index/seg/query -X POST -o /data/response.json -d 'GroupBy(Rows(education_level), Rows(gender), Rows(domain), aggregate=Sum(field=age))'" ABLETESTRESULT=$? -if (( $ABLETESTRESULT != 0 )) -then +if (( $ABLETESTRESULT != 0 )) +then echo "able perf test complete with failures" else echo "able test complete" fi -exit $ABLETESTRESULT \ No newline at end of file +exit $ABLETESTRESULT diff --git a/qa/scripts/perf/able/generateTestData.sh b/qa/scripts/perf/able/generateTestData.sh index 3193050fa..3a27af78f 100755 --- a/qa/scripts/perf/able/generateTestData.sh +++ b/qa/scripts/perf/able/generateTestData.sh @@ -16,7 +16,7 @@ generatePilosaHostsString() { cnt=0 for ip in $DEPLOYED_DATA_IPS do - if (($cnt + 1 != $DEPLOYED_DATA_IPS_LEN)) + if (($cnt + 1 != $DEPLOYED_DATA_IPS_LEN)) then PILOSA_HOSTS="${PILOSA_HOSTS}p${cnt}=$ip:10101," else @@ -30,4 +30,4 @@ generatePilosaHostsString() { generatePilosaHostsString -datagen -s custom --custom-config=./able.yaml --pilosa.index=seg --pilosa.batch-size=1048576 --pilosa.hosts ${PILOSA_HOSTS} \ No newline at end of file +datagen -s custom --custom-config=./able.yaml --pilosa.index=seg --pilosa.batch-size=1048576 --pilosa.hosts ${PILOSA_HOSTS} diff --git a/qa/scripts/perf/able/highcardinalitygroupby.js b/qa/scripts/perf/able/highcardinalitygroupby.js index da8e32d8f..de0c32f7f 100644 --- a/qa/scripts/perf/able/highcardinalitygroupby.js +++ b/qa/scripts/perf/able/highcardinalitygroupby.js @@ -8,4 +8,4 @@ export default function () { let res = http.post(`http://${__ENV.DATANODE0}:10101/index/seg/query`, "GroupBy(Rows(education_level), Rows(gender), Rows(political_party), Rows(domain), aggregate=Sum(field=age))", params); sleep(1); -} \ No newline at end of file +} diff --git a/qa/scripts/perf/able/values/education.txt b/qa/scripts/perf/able/values/education.txt index 4e7c28b29..ca3bcc0c3 100644 --- a/qa/scripts/perf/able/values/education.txt +++ b/qa/scripts/perf/able/values/education.txt @@ -3,4 +3,4 @@ High School Some College College Master's -Doctorate \ No newline at end of file +Doctorate diff --git a/qa/scripts/perf/able/values/gender.txt b/qa/scripts/perf/able/values/gender.txt index 4ae957346..416f3f4ee 100644 --- a/qa/scripts/perf/able/values/gender.txt +++ b/qa/scripts/perf/able/values/gender.txt @@ -2,4 +2,4 @@ Male,0.48 Female,0.48 Transgender,0.01 Other,0.01 -Unspecified,0.02 \ No newline at end of file +Unspecified,0.02 diff --git a/qa/scripts/perf/able/values/income.txt b/qa/scripts/perf/able/values/income.txt index c7149440d..1be0711a2 100644 --- a/qa/scripts/perf/able/values/income.txt +++ b/qa/scripts/perf/able/values/income.txt @@ -4,4 +4,4 @@ $54,201-$86,350 $86,351-$164,900 $164,901-$209,400 $209,401-$523,600 -$523,601 or more \ No newline at end of file +$523,601 or more diff --git a/qa/scripts/perf/able/values/opendns-top-domains-10K.txt b/qa/scripts/perf/able/values/opendns-top-domains-10K.txt index 23ca2c898..09fee3392 100644 --- a/qa/scripts/perf/able/values/opendns-top-domains-10K.txt +++ b/qa/scripts/perf/able/values/opendns-top-domains-10K.txt @@ -9997,4 +9997,4 @@ clkbid.com cyveillance.com musicnet.com mrnumber.com -arenabg.com \ No newline at end of file +arenabg.com diff --git a/qa/scripts/perf/able/values/political_parties.txt b/qa/scripts/perf/able/values/political_parties.txt index d8a9434b8..003b6e9ed 100644 --- a/qa/scripts/perf/able/values/political_parties.txt +++ b/qa/scripts/perf/able/values/political_parties.txt @@ -4,4 +4,4 @@ Independent Libertarian Green Federalist -Whig \ No newline at end of file +Whig diff --git a/qa/scripts/perf/delete/deleteSetup.sh b/qa/scripts/perf/delete/deleteSetup.sh index f3194217b..d4cb30769 100755 --- a/qa/scripts/perf/delete/deleteSetup.sh +++ b/qa/scripts/perf/delete/deleteSetup.sh @@ -3,11 +3,11 @@ # To run script: ./deleteSetup.sh export TF_IN_AUTOMATION=1 -if [ -z ${TF_VAR_cluster_prefix+x} ]; then +if [ -z ${TF_VAR_cluster_prefix+x} ]; then echo "TF_VAR_cluster_prefix is unset"; exit 1 -else - echo "TF_VAR_cluster_prefix is set to '$TF_VAR_cluster_prefix'"; +else + echo "TF_VAR_cluster_prefix is set to '$TF_VAR_cluster_prefix'"; fi SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) @@ -52,11 +52,11 @@ DEPLOYED_INGEST_IPS_LEN=`echo "$DEPLOYED_INGEST_IPS" | wc -l` # wait until we can connect to one of the hosts for i in {0..24} -do +do ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o StrictHostKeyChecking=no -o ConnectTimeout=10 ec2-user@${DATANODE0} "pwd" if [ $? -eq 0 ] then - echo "Cluster is up after ${i} tries." + echo "Cluster is up after ${i} tries." break fi sleep 10 @@ -65,7 +65,7 @@ done ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o StrictHostKeyChecking=no -o ConnectTimeout=10 ec2-user@${DATANODE0} "pwd" if [ $? -ne 0 ] then - echo "Unable to connect to cluster - giving up" + echo "Unable to connect to cluster - giving up" exit 1 fi @@ -74,8 +74,8 @@ setupClusterNodes # verify featurebase running echo "Verifying featurebase cluster running..." curl -s http://${DATANODE0}:10101/status -if (( $? != 0 )) -then +if (( $? != 0 )) +then echo "Featurebase cluster not running" exit 1 fi diff --git a/qa/scripts/perf/delete/deleteTest.sh b/qa/scripts/perf/delete/deleteTest.sh index 9046a2095..ddbc80bd3 100755 --- a/qa/scripts/perf/delete/deleteTest.sh +++ b/qa/scripts/perf/delete/deleteTest.sh @@ -17,7 +17,7 @@ then fi # make it executable -chmod +x datagen +chmod +x datagen if (( $? != 0 )) then echo "couldn't make datagen executable" @@ -26,24 +26,24 @@ fi # copy it over to the ingest node scp -r -i ~/.ssh/gitlab-featurebase-ci.pem ./datagen ec2-user@${INGESTNODE0}:/data -if (( $? != 0 )) -then +if (( $? != 0 )) +then echo "datagen copy failed" exit 1 fi # setup the yum repo needed for librdkafka onto the ingest node scp -r -i ~/.ssh/gitlab-featurebase-ci.pem ./qa/scripts/perf/delete/confluent ec2-user@${INGESTNODE0}:/data -if (( $? != 0 )) -then +if (( $? != 0 )) +then echo "confluent repo setup copy failed" exit 1 fi echo "setting up confluent repo" -ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o "StrictHostKeyChecking no" ec2-user@${INGESTNODE0} "sudo mv /data/confluent /etc/yum.repos.d" +ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o "StrictHostKeyChecking no" ec2-user@${INGESTNODE0} "sudo mv /data/confluent /etc/yum.repos.d" if (( $? != 0 )) -then +then echo "setting up confluent repo failed" exit 1 fi @@ -52,23 +52,23 @@ fi echo "installing librdkafka on ingest node" ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o "StrictHostKeyChecking no" ec2-user@${INGESTNODE0} "sudo rpm --import http://packages.confluent.io/rpm/3.1/archive.key && sudo yum clean all && sudo yum install librdkafka-devel -y" if (( $? != 0 )) -then +then echo "librdkafka install failed" exit 1 fi # copy tremor.yaml over to the ingest node scp -r -i ~/.ssh/gitlab-featurebase-ci.pem ./qa/scripts/perf/delete/tremor.yaml ec2-user@${INGESTNODE0}:/data -if (( $? != 0 )) -then +if (( $? != 0 )) +then echo "tremor.yaml copy failed" exit 1 fi # copy the tests over to ingest node scp -r -i ~/.ssh/gitlab-featurebase-ci.pem ./qa/scripts/perf/delete/test.py ec2-user@${INGESTNODE0}:/data -if (( $? != 0 )) -then +if (( $? != 0 )) +then echo "test copy failed" exit 1 fi @@ -78,11 +78,11 @@ echo "running delete test" ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o "StrictHostKeyChecking no" ec2-user@${INGESTNODE0} "cd /data; python3 test.py ${DATANODE0}" TESTRESULT=$? -if (( $TESTRESULT != 0 )) -then +if (( $TESTRESULT != 0 )) +then echo "delete test failed" else echo "delete test complete" fi -exit $TESTRESULT +exit $TESTRESULT diff --git a/qa/scripts/perf/delete/tremor.yaml b/qa/scripts/perf/delete/tremor.yaml index 45000a4ee..0e94bb877 100644 --- a/qa/scripts/perf/delete/tremor.yaml +++ b/qa/scripts/perf/delete/tremor.yaml @@ -25,7 +25,7 @@ fields: max_date: 2007-01-02T15:04:05.001Z # RFC3339Nano distribution: "increasing" # only "increasing" is supported right now min_step_duration: "10ns" - max_step_duration: "200ms" + max_step_duration: "200ms" - name: "slice" type: "uint-set" # (default IDArrayField) min: 0 diff --git a/qa/scripts/runSamsungGauntlet.sh b/qa/scripts/runSamsungGauntlet.sh old mode 100644 new mode 100755 index 6c1822c91..0431b92cd --- a/qa/scripts/runSamsungGauntlet.sh +++ b/qa/scripts/runSamsungGauntlet.sh @@ -3,12 +3,12 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) # requires TF_VAR_cluster_prefix env var to be set -if [ -z ${TF_VAR_cluster_prefix+x} ]; then +if [ -z ${TF_VAR_cluster_prefix+x} ]; then echo "setting TF_VAR_cluster_prefix"; export TF_VAR_cluster_prefix="gauntlet-$(openssl rand -base64 12 | tr -d /=+ | cut -c -16)" - echo "TF_VAR_cluster_prefix is set to '$TF_VAR_cluster_prefix'"; -else - echo "TF_VAR_cluster_prefix is set to '$TF_VAR_cluster_prefix'"; + echo "TF_VAR_cluster_prefix is set to '$TF_VAR_cluster_prefix'"; +else + echo "TF_VAR_cluster_prefix is set to '$TF_VAR_cluster_prefix'"; fi $SCRIPT_DIR/setupSamsungGauntlet.sh diff --git a/qa/scripts/runSmokeTest.sh b/qa/scripts/runSmokeTest.sh index 8d4ff1923..cba56726f 100755 --- a/qa/scripts/runSmokeTest.sh +++ b/qa/scripts/runSmokeTest.sh @@ -3,12 +3,12 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) # requires TF_VAR_cluster_prefix env var to be set -if [ -z ${TF_VAR_cluster_prefix+x} ]; then +if [ -z ${TF_VAR_cluster_prefix+x} ]; then echo "setting TF_VAR_cluster_prefix"; export TF_VAR_cluster_prefix="smoke-$(openssl rand -base64 12 | tr -d /=+ | cut -c -16)" - echo "TF_VAR_cluster_prefix is set to '$TF_VAR_cluster_prefix'"; -else - echo "TF_VAR_cluster_prefix is set to '$TF_VAR_cluster_prefix'"; + echo "TF_VAR_cluster_prefix is set to '$TF_VAR_cluster_prefix'"; +else + echo "TF_VAR_cluster_prefix is set to '$TF_VAR_cluster_prefix'"; fi $SCRIPT_DIR/setupSmokeTest.sh diff --git a/qa/scripts/setupBackupRestoreGauntlet.sh b/qa/scripts/setupBackupRestoreGauntlet.sh index 2fa611ff9..6f8ef6380 100755 --- a/qa/scripts/setupBackupRestoreGauntlet.sh +++ b/qa/scripts/setupBackupRestoreGauntlet.sh @@ -45,11 +45,11 @@ DEPLOYED_INGEST_IPS_LEN=`echo "$DEPLOYED_INGEST_IPS" | wc -l` #wait until we can connect to one of the hosts for i in {0..24} -do +do ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o StrictHostKeyChecking=no -o ConnectTimeout=10 ec2-user@${DATANODE0} "pwd" if [ $? -eq 0 ] then - echo "Cluster is up after ${i} tries." + echo "Cluster is up after ${i} tries." break fi sleep 10 @@ -58,7 +58,7 @@ done ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o StrictHostKeyChecking=no -o ConnectTimeout=10 ec2-user@${DATANODE0} "pwd" if [ $? -ne 0 ] then - echo "Unable to connect to cluster - giving up" + echo "Unable to connect to cluster - giving up" exit 1 fi @@ -67,8 +67,8 @@ setupClusterNodes # verify featurebase running echo "Verifying featurebase cluster running..." curl -s http://${DATANODE0}:10101/status -if (( $? != 0 )) -then +if (( $? != 0 )) +then echo "Featurebase cluster not running" exit 1 fi diff --git a/qa/scripts/setupSamsungGauntlet.sh b/qa/scripts/setupSamsungGauntlet.sh index 1e6060f2e..fdc7e21c4 100755 --- a/qa/scripts/setupSamsungGauntlet.sh +++ b/qa/scripts/setupSamsungGauntlet.sh @@ -45,11 +45,11 @@ DEPLOYED_INGEST_IPS_LEN=`echo "$DEPLOYED_INGEST_IPS" | wc -l` #wait until we can connect to one of the hosts for i in {0..24} -do +do ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o StrictHostKeyChecking=no -o ConnectTimeout=10 ec2-user@${DATANODE0} "pwd" if [ $? -eq 0 ] then - echo "Cluster is up after ${i} tries." + echo "Cluster is up after ${i} tries." break fi sleep 10 @@ -58,7 +58,7 @@ done ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o StrictHostKeyChecking=no -o ConnectTimeout=10 ec2-user@${DATANODE0} "pwd" if [ $? -ne 0 ] then - echo "Unable to connect to cluster - giving up" + echo "Unable to connect to cluster - giving up" exit 1 fi @@ -67,8 +67,8 @@ setupClusterNodes # verify featurebase running echo "Verifying featurebase cluster running..." curl -s http://${DATANODE0}:10101/status -if (( $? != 0 )) -then +if (( $? != 0 )) +then echo "Featurebase cluster not running" exit 1 fi diff --git a/qa/scripts/setupSmokeTest.sh b/qa/scripts/setupSmokeTest.sh index 0eb601f26..22d25a816 100755 --- a/qa/scripts/setupSmokeTest.sh +++ b/qa/scripts/setupSmokeTest.sh @@ -46,11 +46,11 @@ DEPLOYED_INGEST_IPS_LEN=`echo "$DEPLOYED_INGEST_IPS" | wc -l` #wait until we can connect to one of the hosts for i in {0..24} -do +do ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o StrictHostKeyChecking=no -o ConnectTimeout=10 ec2-user@${DATANODE0} "pwd" if [ $? -eq 0 ] then - echo "Cluster is up after ${i} tries." + echo "Cluster is up after ${i} tries." break fi sleep 10 @@ -59,7 +59,7 @@ done ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o StrictHostKeyChecking=no -o ConnectTimeout=10 ec2-user@${DATANODE0} "pwd" if [ $? -ne 0 ] then - echo "Unable to connect to cluster - giving up" + echo "Unable to connect to cluster - giving up" exit 1 fi @@ -68,8 +68,8 @@ setupClusterNodes # verify featurebase running echo "Verifying featurebase cluster running..." curl -s http://${DATANODE0}:10101/status -if (( $? != 0 )) -then +if (( $? != 0 )) +then echo "Featurebase cluster not running" exit 1 fi diff --git a/qa/scripts/setupTLS.sh b/qa/scripts/setupTLS.sh index e8b3f85c6..f84de2ff1 100755 --- a/qa/scripts/setupTLS.sh +++ b/qa/scripts/setupTLS.sh @@ -10,7 +10,7 @@ fi ifErr() { res=$? - if (( res != 0 )); then + if (( res != 0 )); then echo "error: $1" exit $res fi diff --git a/qa/scripts/testBackupRestoreGauntlet.sh b/qa/scripts/testBackupRestoreGauntlet.sh index a814901c9..8df04986f 100755 --- a/qa/scripts/testBackupRestoreGauntlet.sh +++ b/qa/scripts/testBackupRestoreGauntlet.sh @@ -22,16 +22,16 @@ installDatagen $INGESTNODE0 # copy the tests over to ingest node scp -r -i ~/.ssh/gitlab-featurebase-ci.pem ./qa/scripts/backupRestoreTest.sh ec2-user@${INGESTNODE0}:/data -if (( $? != 0 )) -then +if (( $? != 0 )) +then echo "test copy failed" exit 1 fi # copy the datagen over to ingest node scp -r -i ~/.ssh/gitlab-featurebase-ci.pem ./qa/scripts/backup_test_datagen.yaml ec2-user@${INGESTNODE0}:/data -if (( $? != 0 )) -then +if (( $? != 0 )) +then echo "test copy failed" exit 1 fi @@ -41,11 +41,11 @@ echo "running backup test with hosts: ${HOSTS[@]}" ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o "StrictHostKeyChecking no" ec2-user@${INGESTNODE0} "cd /data; ./backupRestoreTest.sh ${HOSTS[@]}" TESTRESULT=$? -if (( $TESTRESULT != 0 )) -then +if (( $TESTRESULT != 0 )) +then echo "backup test failed" else echo "backup test complete" fi -exit $TESTRESULT +exit $TESTRESULT diff --git a/qa/scripts/testSamsungGauntlet.sh b/qa/scripts/testSamsungGauntlet.sh index 2670439c9..0b64f8b12 100755 --- a/qa/scripts/testSamsungGauntlet.sh +++ b/qa/scripts/testSamsungGauntlet.sh @@ -11,23 +11,23 @@ echo "using DATANODE0 ${DATANODE0}" # generate csv files echo "Building simulacraData..." GOOS=linux GOARCH=arm64 go build ./qa/simulacraData/... -if (( $? != 0 )) -then +if (( $? != 0 )) +then echo "Build failed" exit 1 fi echo "Copying simulacraData..." scp -i ~/.ssh/gitlab-featurebase-ci.pem simulacraData ec2-user@${INGESTNODE0}:/data -if (( $? != 0 )) -then +if (( $? != 0 )) +then echo "Copy failed" exit 1 fi echo "Running simulacraData..." -ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem ec2-user@${INGESTNODE0} "cd /data && /data/simulacraData" -if (( $? != 0 )) -then +ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem ec2-user@${INGESTNODE0} "cd /data && /data/simulacraData" +if (( $? != 0 )) +then echo "Making big files failed" exit 1 fi @@ -36,24 +36,24 @@ echo "Running simulacraData done." # ingest these files the way that samsung does it echo "Copying testSamsungPayload.sh..." scp -i ~/.ssh/gitlab-featurebase-ci.pem ./qa/scripts/testSamsungPayload.sh ec2-user@${INGESTNODE0}: -if (( $? != 0 )) -then +if (( $? != 0 )) +then echo "Copying testSamsungPayload.sh failed" exit 1 fi echo "Running (1) testSamsungPayload.sh..." -ssh -T -A -i ~/.ssh/gitlab-featurebase-ci.pem -o ServerAliveInterval=30 ec2-user@${INGESTNODE0} "./testSamsungPayload.sh http://${DATANODE0}:10101 1" -if (( $? != 0 )) -then +ssh -T -A -i ~/.ssh/gitlab-featurebase-ci.pem -o ServerAliveInterval=30 ec2-user@${INGESTNODE0} "./testSamsungPayload.sh http://${DATANODE0}:10101 1" +if (( $? != 0 )) +then echo "Running 1 testSamsungPayload.sh failed" exit 1 fi echo "Running (0) testSamsungPayload.sh..." -ssh -T -A -i ~/.ssh/gitlab-featurebase-ci.pem -o ServerAliveInterval=30 ec2-user@${INGESTNODE0} "./testSamsungPayload.sh http://${DATANODE0}:10101 0" -if (( $? != 0 )) -then +ssh -T -A -i ~/.ssh/gitlab-featurebase-ci.pem -o ServerAliveInterval=30 ec2-user@${INGESTNODE0} "./testSamsungPayload.sh http://${DATANODE0}:10101 0" +if (( $? != 0 )) +then echo "Running 0 testSamsungPayload.sh failed" exit 1 fi @@ -61,4 +61,4 @@ fi # query workload that runs -echo "Done." \ No newline at end of file +echo "Done." diff --git a/qa/scripts/testSamsungPayload.sh b/qa/scripts/testSamsungPayload.sh index 85752b409..676fa4669 100755 --- a/qa/scripts/testSamsungPayload.sh +++ b/qa/scripts/testSamsungPayload.sh @@ -3,7 +3,7 @@ # path for featurebase binary FEATUREBASE_PATH=/usr/local/bin -# path for directory with csv directory files for all fields to be ingested +# path for directory with csv directory files for all fields to be ingested CSV_DIR_PATH=/data # To run: @@ -11,29 +11,29 @@ CSV_DIR_PATH=/data function delete_field { if (($INITIALIZE == 0)); - then + then curl -XDELETE $HOST/index/$INDEX/field/$FIELD fi } -# Script to replicate samsung workload of deleting and re-ingesting fields every night -# outline delete and re-ingest workload -function ingest_int_field { +# Script to replicate samsung workload of deleting and re-ingesting fields every night +# outline delete and re-ingest workload +function ingest_int_field { delete_field curl -XPOST $HOST/index/$INDEX/field/$FIELD -d '{"options": {"type": "int", "min": 0, "max":'$MAX'}}' - $FEATUREBASE_PATH/featurebase import --host $HOST -i $INDEX -f $FIELD $CSV_FILE + $FEATUREBASE_PATH/featurebase import --host $HOST -i $INDEX -f $FIELD $CSV_FILE } function ingest_time_field { delete_field curl -XPOST $HOST/index/$INDEX/field/$FIELD -d '{"options": {"keys": true, "type": "time", "timeQuantum": "YMD"}}' - $FEATUREBASE_PATH/featurebase import --host $HOST -i $INDEX -f $FIELD $CSV_FILE + $FEATUREBASE_PATH/featurebase import --host $HOST -i $INDEX -f $FIELD $CSV_FILE } function ingest_set_field { delete_field curl -XPOST $HOST/index/$INDEX/field/$FIELD -d '{"options": {"keys": true}}' - $FEATUREBASE_PATH/featurebase import --host $HOST -i $INDEX -f $FIELD $CSV_FILE + $FEATUREBASE_PATH/featurebase import --host $HOST -i $INDEX -f $FIELD $CSV_FILE } # featurebase host & port @@ -42,37 +42,37 @@ shift # intialize flag - 0:disabled, 1:enabled - creates the index and fields for testing INITIALIZE=$1 -shift +shift -# get a list of csv files in the directory +# get a list of csv files in the directory CSV_FILES=`ls $CSV_DIR_PATH/*.csv` -# assign index name +# assign index name INDEX="samsung" if (($INITIALIZE == 1)); -then +then curl -XPOST $HOST/index/$INDEX fi -# perform delete and re-ingest for all fields +# perform delete and re-ingest for all fields for CSV_FILE in ${CSV_FILES[@]} - do - # get field name from csv file path + do + # get field name from csv file path FIELD="$(basename $CSV_FILE .csv)" if [[ "$FIELD" == *"age"* ]]; - then - MAX=100 + then + MAX=100 ingest_int_field elif [[ "$FIELD" == *"identifier"* ]]; - then + then MAX=$((2**63 - 1)) # compute max value for 64bit ingest_int_field elif [[ "$FIELD" == *"ip"* ]]; - then + then MAX=$((2**31 - 1)) # compute max value for 32bit ingest_int_field elif [[ "$FIELD" == *"time"* ]]; - then + then ingest_time_field else ingest_set_field diff --git a/qa/scripts/testSmokeTest.sh b/qa/scripts/testSmokeTest.sh index b27b12931..a9b66a53c 100755 --- a/qa/scripts/testSmokeTest.sh +++ b/qa/scripts/testSmokeTest.sh @@ -19,30 +19,30 @@ mv config.py ./qa/testcases/smoketest/config.py echo "Copying tests to remote" scp -r -i ~/.ssh/gitlab-featurebase-ci.pem ./qa/testcases/smoketest/*.py ec2-user@${INGESTNODE0}:/data -if (( $? != 0 )) -then +if (( $? != 0 )) +then echo "Copy failed" exit 1 fi # run smoke test echo "Running smoke test..." -ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o "StrictHostKeyChecking no" ec2-user@${INGESTNODE0} "cd /data; ~/.local/bin/pytest --junitxml=report.xml" +ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o "StrictHostKeyChecking no" ec2-user@${INGESTNODE0} "cd /data; ~/.local/bin/pytest --junitxml=report.xml" SMOKETESTRESULT=$? echo "Copying test report to local" scp -r -i ~/.ssh/gitlab-featurebase-ci.pem ec2-user@${INGESTNODE0}:/data/report.xml report.xml -if (( $? != 0 )) -then +if (( $? != 0 )) +then echo "Copy failed" exit 1 fi -if (( $SMOKETESTRESULT != 0 )) -then +if (( $SMOKETESTRESULT != 0 )) +then echo "Smoke test complete with test failures" else echo "Smoke test complete" fi -exit $SMOKETESTRESULT \ No newline at end of file +exit $SMOKETESTRESULT diff --git a/qa/scripts/utilCluster.sh b/qa/scripts/utilCluster.sh old mode 100644 new mode 100755 diff --git a/qa/testcases/bug-repros/fb-1332.sh b/qa/testcases/bug-repros/fb-1332.sh old mode 100644 new mode 100755 index b1d5b50ad..d98ba0513 --- a/qa/testcases/bug-repros/fb-1332.sh +++ b/qa/testcases/bug-repros/fb-1332.sh @@ -20,7 +20,7 @@ if [[ $( curl -XDELETE $1/index/fb1332| jq '.error' ) != "null" ]]; then exit 1 fi -# fb restore +# fb restore featurebase restore --host=$1 -s=fb1332.bak if (( $? != 0 )); then echo "couldn't restore" diff --git a/qa/tf/ci/auth-smoke/provider.tf b/qa/tf/ci/auth-smoke/provider.tf index c0fc95d9d..f6f28cca8 100644 --- a/qa/tf/ci/auth-smoke/provider.tf +++ b/qa/tf/ci/auth-smoke/provider.tf @@ -1,4 +1,4 @@ provider "aws" { region = var.region profile = var.profile -} \ No newline at end of file +} diff --git a/qa/tf/ci/auth-smoke/tf.auto.tfvars b/qa/tf/ci/auth-smoke/tf.auto.tfvars index ac6de62a6..d2b94a97a 100644 --- a/qa/tf/ci/auth-smoke/tf.auto.tfvars +++ b/qa/tf/ci/auth-smoke/tf.auto.tfvars @@ -1,2 +1,2 @@ region = "us-east-2" -profile = "service-terraform" \ No newline at end of file +profile = "service-terraform" diff --git a/qa/tf/ci/smoketest/main.tf b/qa/tf/ci/smoketest/main.tf index 5d600d1fa..404a42fc2 100644 --- a/qa/tf/ci/smoketest/main.tf +++ b/qa/tf/ci/smoketest/main.tf @@ -11,4 +11,4 @@ module "ci-cluster" { vpc_cidr_block = "10.0.0.0/16" vpc_public_subnets = ["subnet-066b4b922b54e51a2","subnet-037b8884269a69025","subnet-08482631514426210",] vpc_private_subnets = ["subnet-0319dde319380326f","subnet-0517ca9a646d80f88","subnet-05a7b685ed27eb1cf",] -} \ No newline at end of file +} diff --git a/qa/tf/ci/smoketest/provider.tf b/qa/tf/ci/smoketest/provider.tf index c0fc95d9d..f6f28cca8 100644 --- a/qa/tf/ci/smoketest/provider.tf +++ b/qa/tf/ci/smoketest/provider.tf @@ -1,4 +1,4 @@ provider "aws" { region = var.region profile = var.profile -} \ No newline at end of file +} diff --git a/qa/tf/ci/smoketest/tf.auto.tfvars b/qa/tf/ci/smoketest/tf.auto.tfvars index ac6de62a6..d2b94a97a 100644 --- a/qa/tf/ci/smoketest/tf.auto.tfvars +++ b/qa/tf/ci/smoketest/tf.auto.tfvars @@ -1,2 +1,2 @@ region = "us-east-2" -profile = "service-terraform" \ No newline at end of file +profile = "service-terraform" diff --git a/qa/tf/gauntlet/backuprestore/provider.tf b/qa/tf/gauntlet/backuprestore/provider.tf index c0fc95d9d..f6f28cca8 100644 --- a/qa/tf/gauntlet/backuprestore/provider.tf +++ b/qa/tf/gauntlet/backuprestore/provider.tf @@ -1,4 +1,4 @@ provider "aws" { region = var.region profile = var.profile -} \ No newline at end of file +} diff --git a/qa/tf/gauntlet/backuprestore/tf.auto.tfvars b/qa/tf/gauntlet/backuprestore/tf.auto.tfvars index ac6de62a6..d2b94a97a 100644 --- a/qa/tf/gauntlet/backuprestore/tf.auto.tfvars +++ b/qa/tf/gauntlet/backuprestore/tf.auto.tfvars @@ -1,2 +1,2 @@ region = "us-east-2" -profile = "service-terraform" \ No newline at end of file +profile = "service-terraform" diff --git a/qa/tf/gauntlet/samsung/main.tf b/qa/tf/gauntlet/samsung/main.tf index 440f833ca..2c79a1d6c 100644 --- a/qa/tf/gauntlet/samsung/main.tf +++ b/qa/tf/gauntlet/samsung/main.tf @@ -13,4 +13,4 @@ module "samsung-cluster" { vpc_cidr_block = "10.0.0.0/16" vpc_public_subnets = ["subnet-066b4b922b54e51a2","subnet-037b8884269a69025","subnet-08482631514426210",] vpc_private_subnets = ["subnet-0319dde319380326f","subnet-0517ca9a646d80f88","subnet-05a7b685ed27eb1cf",] -} \ No newline at end of file +} diff --git a/qa/tf/gauntlet/samsung/provider.tf b/qa/tf/gauntlet/samsung/provider.tf index c0fc95d9d..f6f28cca8 100644 --- a/qa/tf/gauntlet/samsung/provider.tf +++ b/qa/tf/gauntlet/samsung/provider.tf @@ -1,4 +1,4 @@ provider "aws" { region = var.region profile = var.profile -} \ No newline at end of file +} diff --git a/qa/tf/gauntlet/samsung/tf.auto.tfvars b/qa/tf/gauntlet/samsung/tf.auto.tfvars index ac6de62a6..d2b94a97a 100644 --- a/qa/tf/gauntlet/samsung/tf.auto.tfvars +++ b/qa/tf/gauntlet/samsung/tf.auto.tfvars @@ -1,2 +1,2 @@ region = "us-east-2" -profile = "service-terraform" \ No newline at end of file +profile = "service-terraform" diff --git a/qa/tf/perf/able/main.tf b/qa/tf/perf/able/main.tf index 514f52173..06e192845 100644 --- a/qa/tf/perf/able/main.tf +++ b/qa/tf/perf/able/main.tf @@ -14,4 +14,4 @@ module "able-cluster" { vpc_cidr_block = "10.0.0.0/16" vpc_public_subnets = ["subnet-066b4b922b54e51a2","subnet-037b8884269a69025","subnet-08482631514426210",] vpc_private_subnets = ["subnet-0319dde319380326f","subnet-0517ca9a646d80f88","subnet-05a7b685ed27eb1cf",] -} \ No newline at end of file +} diff --git a/qa/tf/perf/able/provider.tf b/qa/tf/perf/able/provider.tf index c0fc95d9d..f6f28cca8 100644 --- a/qa/tf/perf/able/provider.tf +++ b/qa/tf/perf/able/provider.tf @@ -1,4 +1,4 @@ provider "aws" { region = var.region profile = var.profile -} \ No newline at end of file +} diff --git a/qa/tf/perf/able/tf.auto.tfvars b/qa/tf/perf/able/tf.auto.tfvars index ac6de62a6..d2b94a97a 100644 --- a/qa/tf/perf/able/tf.auto.tfvars +++ b/qa/tf/perf/able/tf.auto.tfvars @@ -1,2 +1,2 @@ region = "us-east-2" -profile = "service-terraform" \ No newline at end of file +profile = "service-terraform" diff --git a/scripts/bench_read.sh b/scripts/bench_read.sh index ee13e1a40..158b705a4 100755 --- a/scripts/bench_read.sh +++ b/scripts/bench_read.sh @@ -21,7 +21,7 @@ SHA=$(git -C $PILOSA_SRC rev-parse HEAD) # Format current date. DATE=$(date '+%Y%m%d') -for TYPE in row row-bsi row-range count count-keyed intersect union difference xor groupby topk +for TYPE in row row-bsi row-range count count-keyed intersect union difference xor groupby topk do WORKFLOW_PATH="${BASH_SOURCE%/*}/etc/gloat/query.${TYPE}.yml" WORKFLOW_NAME="$(gloat workflow name $WORKFLOW_PATH)" @@ -46,4 +46,4 @@ do # Post graph to Slack with SHA. curl -F file=@/tmp/output.png -F channels=C01HBFKRLGH -F "initial_comment=$TITLE" -H "Authorization: Bearer $SLACK_OAUTH_TOKEN" https://slack.com/api/files.upload -done \ No newline at end of file +done diff --git a/scripts/bench_write.sh b/scripts/bench_write.sh index f9b18ed8e..fbd8d1465 100755 --- a/scripts/bench_write.sh +++ b/scripts/bench_write.sh @@ -21,7 +21,7 @@ SHA=$(git -C $PILOSA_SRC rev-parse HEAD) # Format current date. DATE=$(date '+%Y%m%d') -for FILENAME in gh.1m.yml gh.issues.keyed.yml gh.issues.unkeyed.yml gh.issues.autogenerate.yml +for FILENAME in gh.1m.yml gh.issues.keyed.yml gh.issues.unkeyed.yml gh.issues.autogenerate.yml do WORKFLOW_PATH="${BASH_SOURCE%/*}/etc/gloat/${FILENAME}" WORKFLOW_NAME="$(gloat workflow name $WORKFLOW_PATH)" @@ -39,4 +39,4 @@ do # Post graph to Slack with SHA. curl -F file=@/tmp/output.png -F channels=C01HBFKRLGH -F "initial_comment=$TITLE" -H "Authorization: Bearer $SLACK_OAUTH_TOKEN" https://slack.com/api/files.upload -done \ No newline at end of file +done diff --git a/scripts/etc/gloat/gh.1d.yml b/scripts/etc/gloat/gh.1d.yml index e5332b565..95694e1b8 100644 --- a/scripts/etc/gloat/gh.1d.yml +++ b/scripts/etc/gloat/gh.1d.yml @@ -1,7 +1,7 @@ name: "GitHub Import Load Testing (1 day)" main: "pilosa server --data-dir ${TMPDIR} --storage.backend ${STORAGE_BACKEND}" -load: "molecula-consumer-github -i events -d id --record-type event --batch-size=100000 --start-time 2020-01-01T00:00:00Z --end-time 2020-01-01T23:00:00Z --cache-dir ~/.githubarchive" +load: "molecula-consumer-github -i events -d id --record-type event --batch-size=100000 --start-time 2020-01-01T00:00:00Z --end-time 2020-01-01T23:00:00Z --cache-dir ~/.githubarchive" health_url: "http://localhost:10101/status" vars_urls: diff --git a/scripts/etc/gloat/gh.1m.yml b/scripts/etc/gloat/gh.1m.yml index d0c382797..be2945385 100644 --- a/scripts/etc/gloat/gh.1m.yml +++ b/scripts/etc/gloat/gh.1m.yml @@ -1,7 +1,7 @@ name: "GitHub Import Load Testing (1 month)" main: "pilosa server --data-dir ${TMPDIR} --storage.backend ${STORAGE_BACKEND}" -load: "molecula-consumer-github -i events -d id --record-type event --batch-size=100000 --start-time 2020-01-01T00:00:00Z --end-time 2020-01-31T23:00:00Z --cache-dir ~/.githubarchive" +load: "molecula-consumer-github -i events -d id --record-type event --batch-size=100000 --start-time 2020-01-01T00:00:00Z --end-time 2020-01-31T23:00:00Z --cache-dir ~/.githubarchive" health_url: "http://localhost:10101/status" vars_urls: diff --git a/scripts/etc/gloat/gh.1w.yml b/scripts/etc/gloat/gh.1w.yml index 987f6f65f..f1e52d0e5 100644 --- a/scripts/etc/gloat/gh.1w.yml +++ b/scripts/etc/gloat/gh.1w.yml @@ -1,7 +1,7 @@ name: "GitHub Import Load Testing (1 week)" main: "pilosa server --data-dir ${TMPDIR} --storage.backend ${STORAGE_BACKEND}" -load: "molecula-consumer-github -i events -d id --record-type event --batch-size=100000 --start-time 2020-01-01T00:00:00Z --end-time 2020-01-06T23:00:00Z --cache-dir ~/.githubarchive" +load: "molecula-consumer-github -i events -d id --record-type event --batch-size=100000 --start-time 2020-01-01T00:00:00Z --end-time 2020-01-06T23:00:00Z --cache-dir ~/.githubarchive" health_url: "http://localhost:10101/status" vars_urls: diff --git a/scripts/etc/gloat/gh.issues.autogenerate.yml b/scripts/etc/gloat/gh.issues.autogenerate.yml index d1ceeace5..a8193ebfc 100644 --- a/scripts/etc/gloat/gh.issues.autogenerate.yml +++ b/scripts/etc/gloat/gh.issues.autogenerate.yml @@ -1,7 +1,7 @@ name: "GitHub Issues Import Load Testing (two weeks, autogenerated ID)" main: "pilosa server --data-dir ${TMPDIR} --txsrc ${STORAGE_BACKEND}" -load: "molecula-consumer-github -i issues -a --external-generate --record-type issue --batch-size=100000 --start-time 2020-01-01T00:00:00Z --end-time 2020-01-13T23:00:00Z --cache-dir ~/.githubarchive" +load: "molecula-consumer-github -i issues -a --external-generate --record-type issue --batch-size=100000 --start-time 2020-01-01T00:00:00Z --end-time 2020-01-13T23:00:00Z --cache-dir ~/.githubarchive" health_url: "http://localhost:10101/status" vars_urls: diff --git a/scripts/etc/gloat/gh.issues.keyed.yml b/scripts/etc/gloat/gh.issues.keyed.yml index b2bb70426..275308287 100644 --- a/scripts/etc/gloat/gh.issues.keyed.yml +++ b/scripts/etc/gloat/gh.issues.keyed.yml @@ -1,7 +1,7 @@ name: "GitHub Issues Import Load Testing (1 month, keyed)" main: "pilosa server --data-dir ${TMPDIR} --storage.backend ${STORAGE_BACKEND}" -load: "molecula-consumer-github -i issues -r url --record-type issue --batch-size=100000 --start-time 2020-01-01T00:00:00Z --end-time 2020-01-13T23:00:00Z --cache-dir ~/.githubarchive" +load: "molecula-consumer-github -i issues -r url --record-type issue --batch-size=100000 --start-time 2020-01-01T00:00:00Z --end-time 2020-01-13T23:00:00Z --cache-dir ~/.githubarchive" health_url: "http://localhost:10101/status" vars_urls: diff --git a/scripts/etc/gloat/gh.issues.unkeyed.yml b/scripts/etc/gloat/gh.issues.unkeyed.yml index 0f8113a92..d7e369fc9 100644 --- a/scripts/etc/gloat/gh.issues.unkeyed.yml +++ b/scripts/etc/gloat/gh.issues.unkeyed.yml @@ -1,7 +1,7 @@ name: "GitHub Issues Import Load Testing (1 month, unkeyed)" main: "pilosa server --data-dir ${TMPDIR} --storage.backend ${STORAGE_BACKEND}" -load: "molecula-consumer-github -i issues -d id --record-type issue --batch-size=100000 --start-time 2020-01-01T00:00:00Z --end-time 2020-01-13T23:00:00Z --cache-dir ~/.githubarchive" +load: "molecula-consumer-github -i issues -d id --record-type issue --batch-size=100000 --start-time 2020-01-01T00:00:00Z --end-time 2020-01-13T23:00:00Z --cache-dir ~/.githubarchive" health_url: "http://localhost:10101/status" vars_urls: diff --git a/scripts/etc/gloat/query.count-keyed.yml b/scripts/etc/gloat/query.count-keyed.yml index ad3ca0dea..9bbe700cc 100644 --- a/scripts/etc/gloat/query.count-keyed.yml +++ b/scripts/etc/gloat/query.count-keyed.yml @@ -1,7 +1,7 @@ name: "Count() Load Testing w/ Keys" main: "pilosa server --data-dir ~/pilosa.query.keyed.${STORAGE_BACKEND} --storage.backend ${STORAGE_BACKEND}" -load: "pilosa-bench -type count -rate 100 -n 3000" +load: "pilosa-bench -type count -rate 100 -n 3000" health_url: "http://localhost:10101/status" health_regexp: "NORMAL" diff --git a/scripts/etc/gloat/query.count.yml b/scripts/etc/gloat/query.count.yml index d296be292..3fd8600c6 100644 --- a/scripts/etc/gloat/query.count.yml +++ b/scripts/etc/gloat/query.count.yml @@ -1,7 +1,7 @@ name: "Count() Load Testing" main: "pilosa server --data-dir ~/pilosa.query.${STORAGE_BACKEND} --storage.backend ${STORAGE_BACKEND}" -load: "pilosa-bench -type count -rate 100 -n 3000" +load: "pilosa-bench -type count -rate 100 -n 3000" health_url: "http://localhost:10101/status" health_regexp: "NORMAL" diff --git a/scripts/etc/gloat/query.difference.yml b/scripts/etc/gloat/query.difference.yml index 1c32d6e2c..ec32d894f 100644 --- a/scripts/etc/gloat/query.difference.yml +++ b/scripts/etc/gloat/query.difference.yml @@ -1,7 +1,7 @@ name: "Difference() Load Testing" main: "pilosa server --data-dir ~/pilosa.query.${STORAGE_BACKEND} --storage.backend ${STORAGE_BACKEND}" -load: "pilosa-bench -type difference -rate 10 -n 300" +load: "pilosa-bench -type difference -rate 10 -n 300" health_url: "http://localhost:10101/status" health_regexp: "NORMAL" diff --git a/scripts/etc/gloat/query.groupby.yml b/scripts/etc/gloat/query.groupby.yml index 5d32b4400..870277bb4 100644 --- a/scripts/etc/gloat/query.groupby.yml +++ b/scripts/etc/gloat/query.groupby.yml @@ -1,7 +1,7 @@ name: "GroupBy() Load Testing" main: "pilosa server --data-dir ~/pilosa.query.${STORAGE_BACKEND} --storage.backend ${STORAGE_BACKEND}" -load: "pilosa-bench -type groupby -rate 100 -n 3000" +load: "pilosa-bench -type groupby -rate 100 -n 3000" health_url: "http://localhost:10101/status" health_regexp: "NORMAL" diff --git a/scripts/etc/gloat/query.intersect.yml b/scripts/etc/gloat/query.intersect.yml index 11d9bd186..d1f731cdb 100644 --- a/scripts/etc/gloat/query.intersect.yml +++ b/scripts/etc/gloat/query.intersect.yml @@ -1,7 +1,7 @@ name: "Intersect() Load Testing" main: "pilosa server --data-dir ~/pilosa.query.${STORAGE_BACKEND} --storage.backend ${STORAGE_BACKEND}" -load: "pilosa-bench -type intersect -rate 100 -n 3000" +load: "pilosa-bench -type intersect -rate 100 -n 3000" health_url: "http://localhost:10101/status" health_regexp: "NORMAL" diff --git a/scripts/etc/gloat/query.row-bsi.yml b/scripts/etc/gloat/query.row-bsi.yml index 7b018cb0a..842207386 100644 --- a/scripts/etc/gloat/query.row-bsi.yml +++ b/scripts/etc/gloat/query.row-bsi.yml @@ -1,7 +1,7 @@ name: "Row(BSI) Load Testing" main: "pilosa server --data-dir ~/pilosa.query.${STORAGE_BACKEND} --storage.backend ${STORAGE_BACKEND}" -load: "pilosa-bench -type row -rate 100 -n 3000" +load: "pilosa-bench -type row -rate 100 -n 3000" health_url: "http://localhost:10101/status" health_regexp: "NORMAL" diff --git a/scripts/etc/gloat/query.row-range.yml b/scripts/etc/gloat/query.row-range.yml index 30b1c18e9..29622305a 100644 --- a/scripts/etc/gloat/query.row-range.yml +++ b/scripts/etc/gloat/query.row-range.yml @@ -1,7 +1,7 @@ name: "Time-based Row() Load Testing" main: "pilosa server --data-dir ~/pilosa.query.${STORAGE_BACKEND} --storage.backend ${STORAGE_BACKEND}" -load: "pilosa-bench -type row-range -rate 10 -n 300 -from 2020-01-01T00:00:00Z -to 2020-01-31T23:00:00Z" +load: "pilosa-bench -type row-range -rate 10 -n 300 -from 2020-01-01T00:00:00Z -to 2020-01-31T23:00:00Z" health_url: "http://localhost:10101/status" health_regexp: "NORMAL" diff --git a/scripts/etc/gloat/query.row.yml b/scripts/etc/gloat/query.row.yml index bf52bf101..c117e1661 100644 --- a/scripts/etc/gloat/query.row.yml +++ b/scripts/etc/gloat/query.row.yml @@ -1,7 +1,7 @@ name: "Row() Load Testing" main: "pilosa server --data-dir ~/pilosa.query.${STORAGE_BACKEND} --storage.backend ${STORAGE_BACKEND}" -load: "pilosa-bench -type row -rate 100 -n 3000" +load: "pilosa-bench -type row -rate 100 -n 3000" health_url: "http://localhost:10101/status" health_regexp: "NORMAL" diff --git a/scripts/etc/gloat/query.topk.yml b/scripts/etc/gloat/query.topk.yml index 416d92772..9cb3239bf 100644 --- a/scripts/etc/gloat/query.topk.yml +++ b/scripts/etc/gloat/query.topk.yml @@ -1,7 +1,7 @@ name: "Time-based TopK() Load Testing" main: "pilosa server --data-dir ~/pilosa.query.${STORAGE_BACKEND} --storage.backend ${STORAGE_BACKEND}" -load: "pilosa-bench -type row-range -rate 10 -n 300 -from 2020-01-01T00:00:00Z -to 2020-01-31T23:00:00Z" +load: "pilosa-bench -type row-range -rate 10 -n 300 -from 2020-01-01T00:00:00Z -to 2020-01-31T23:00:00Z" health_url: "http://localhost:10101/status" health_regexp: "NORMAL" diff --git a/scripts/etc/gloat/query.xor.yml b/scripts/etc/gloat/query.xor.yml index 2d8a039f4..abcae804a 100644 --- a/scripts/etc/gloat/query.xor.yml +++ b/scripts/etc/gloat/query.xor.yml @@ -1,7 +1,7 @@ name: "Xor() Load Testing" main: "pilosa server --data-dir ~/pilosa.query.${STORAGE_BACKEND} --storage.backend ${STORAGE_BACKEND}" -load: "pilosa-bench -type xor -rate 10 -n 300" +load: "pilosa-bench -type xor -rate 10 -n 300" health_url: "http://localhost:10101/status" health_regexp: "NORMAL" diff --git a/testdata/timeRegressionSchema.json b/testdata/timeRegressionSchema.json index bc131015d..d02f00ff9 100644 --- a/testdata/timeRegressionSchema.json +++ b/testdata/timeRegressionSchema.json @@ -29,4 +29,4 @@ "shardWidth": 1048576 } ] -} \ No newline at end of file +}