Fixing ttfr

Author: edeandrea

benchmarks/main.yml

@@ -98,13 +98,13 @@ scripts:
     - sh: sudo rm -Rf ${{REPO_DIR}}
     - sh: mkdir -p ${{REPO_DIR}}/logs
     - sh: cd ${{REPO_DIR}}
-    - log: Cloning project repo
+    - log: Cloning project repo ${{config.repo.branch}}@${{config.repo.url}}
     - sh: git clone -b ${{config.repo.branch}} ${{config.repo.url}}
     - sh: cd ${{PROJ_REPO_NAME}}
     - log: Checked out repo
     - sh: git remote get-url origin
     - sh: git branch --show-current
-    - sh: cd scripts/startup
+    - sh: cd ${{SCRIPTS_DIR}}
     - sh: npm install axios@0.27.2
 
 #  install-wrk: #TODO: Move to core-scripts
@@ -266,14 +266,14 @@ scripts:
     - sh: ${{RUNTIME.buildCmd}}
     - for-each: ITERATION ${{=[...Array(${{ITERATIONS}}).keys()]}}
       then:
-      - sh: node ${{REPO_DIR}}/scripts/startup/time.js "${{= "${{RUNTIME.runCmd}}".trim().replace(/  +/g, ' ') }}" ${{TARGET_URL}} | awk '{print $1}'
-        then:
-        - set-state: START_TIME
-      - script: state-array-push
-        with:
-          array: RUN.output.results.${{RUNTIME.name}}.startup.timings
-          value: ${{START_TIME}}
-      - sh: sleep ${{PAUSE_TIME}}
+        - sh: node ${{SCRIPTS_DIR}}/time.js "${{= "${{RUNTIME.runCmd}}".trim().replace(/  +/g, ' ') }}" ${{TARGET_URL}} | awk '{print $1}'
+          then:
+          - set-state:   START_TIME
+        - script: state-array-push
+          with:
+            array: RUN.output.results.${{RUNTIME.name}}.startup.timings
+            value: ${{START_TIME}}
+        - sh: sleep ${{PAUSE_TIME}}
     - script: state-array-calc-avg
       with:
         var-name: RUN.output.results.${{RUNTIME.name}}.startup.avStartTime
@@ -285,27 +285,27 @@ scripts:
     - sh: cd ${{RUNTIME.dir}}
     - for-each: ITERATION ${{=[...Array(${{ITERATIONS}}).keys()]}}
       then:
-      - sh: ${{RUNTIME.runCmd}} 2>&1 >${{REPO_DIR}}/logs/measure-rss-${{RUNTIME.name}}-${{ITERATION}}.log &
-      - sh: APP_PID=$!
-      - log: $APP_PID
-      - sh: sleep ${{PAUSE_TIME}}
-      - sh: pmap -x $APP_PID | grep total | awk '{print $4}'
-        then:
-          - set-state: RSS_STARTUP
-      - script: state-array-push
-        with:
-          array: RUN.output.results.${{RUNTIME.name}}.rss.startup
-          value: ${{= ${{RSS_STARTUP}}/1024 }}
-      - sh: curl -s  ${{TARGET_URL}} > /dev/null
-      - sh: pmap -x $APP_PID | grep total | awk '{print $4}'
-        then:
-          - set-state: FIRST_REQUEST
-      - script: state-array-push
-        with:
-          array: RUN.output.results.${{RUNTIME.name}}.rss.firstRequest
-          value: ${{= ${{FIRST_REQUEST}}/1024 }}
-      - sh: kill -15 $APP_PID
-      - sh: sleep ${{PAUSE_TIME}}
+        - sh: ${{RUNTIME.runCmd}} 2>&1 >${{REPO_DIR}}/logs/measure-rss-${{RUNTIME.name}}-${{ITERATION}}.log &
+        - sh: APP_PID=$!
+        - log: $APP_PID
+        - sh: sleep ${{PAUSE_TIME}}
+        - sh: pmap -x $APP_PID | grep total | awk '{print $4}'
+          then:
+            - set-state: RSS_STARTUP
+        - script: state-array-push
+          with:
+            array: RUN.output.results.${{RUNTIME.name}}.rss.startup
+            value: ${{= ${{RSS_STARTUP}}/1024 }}
+        - sh: curl -s  ${{TARGET_URL}} > /dev/null
+        - sh: pmap -x $APP_PID | grep total | awk '{print $4}'
+          then:
+            - set-state: FIRST_REQUEST
+        - script: state-array-push
+          with:
+            array: RUN.output.results.${{RUNTIME.name}}.rss.firstRequest
+            value: ${{= ${{FIRST_REQUEST}}/1024 }}
+        - sh: kill -15 $APP_PID
+        - sh: sleep ${{PAUSE_TIME}}
     - script: state-array-calc-avg
       with:
         var-name: RUN.output.results.${{RUNTIME.name}}.rss.avStartupRss

scripts/infra.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 set -euo pipefail
+thisdir=`dirname "$0"`
 
 help() {
   echo "This script starts the necessary services for the app in question"
@@ -19,7 +20,7 @@ exit_abnormal() {
 
 start_postgres() {
   echo "Starting PostgreSQL database '${DB_CONTAINER_NAME}'"
-  local pid=$(${engine} run -d --rm=true --name ${DB_CONTAINER_NAME} -v ./dbdata:/docker-entrypoint-initdb.d/ -p 5432:5432 -e POSTGRES_USER=fruits -e POSTGRES_PASSWORD=fruits -e POSTGRES_DB=fruits postgres:17 > /dev/null)
+  local pid=$(cd ${thisdir} && ${engine} run -d --rm=true --name ${DB_CONTAINER_NAME} -v ./dbdata:/docker-entrypoint-initdb.d/ -p 5432:5432 -e POSTGRES_USER=fruits -e POSTGRES_PASSWORD=fruits -e POSTGRES_DB=fruits postgres:17 > /dev/null)
   echo "PostgreSQL DB process: $pid"
 
   echo "Waiting for PostgreSQL to be ready..."