script updates

Author: molly-moen

load-test/scripts/configuration.js

@@ -23,7 +23,10 @@ export const PRIVATE_KEY = null;
 // Long requests time: we don't want requests to go over this time in the p(95) case
 export const LONG_REQUEST_MS = 5000;
 // Extra long request time: we never want requests to go over this time.
-export const EXTRA_LONG_REQUEST_MS = 14000;
+export const EXTRA_LONG_REQUEST_MS = 10000;
+// Timeout if we go greater than the max request time to ensure we stay
+// close to our concurrent user goal.
+export const MAX_REQUEST_TIME_MS = 20000;
 
 // Mini-app types
 export const MiniAppType = {
@@ -32,28 +35,28 @@ export const MiniAppType = {
   THEATER: 'theater'
 };
 
-export function getTestOptions(maxUserGoal, rampUpTimeMinutes, highLoadTimeMinutes) {
+export function getTestOptions(maxUserGoal, highLoadTimeMinutes) {
   const maxConcurrentUsers =  Math.floor(maxUserGoal / 30);
   return  {
     scenarios: {
-      // ramp up to maxConcurrentUsers VUs over rampUpTimeMinutes
-      rampUp: {
-        executor: "ramping-vus",
-        startVUs: 0,
-        stages: [
-          {duration: `${rampUpTimeMinutes}m`, target: maxConcurrentUsers}
-        ]
+      halfConcurrency: {
+        executor: "constant-vus",
+        vus: Math.ceil(maxConcurrentUsers / 2),
+        duration: '1m',
       },
-      // have maxConcurrentUsers VUs do 3 iterations each minute, for a total of highLoadTimeMinutes * 3
-      // iterations per virutal user.
-      // Start this after the ramp up time.
+      initialHighConcurrency: {
+        executor: "constant-vus",
+        vus: maxConcurrentUsers,
+        duration: '1m',
+        startTime: '1m'
+      },
+      // maintain maxConcurrentUsers VUs for highLoadTimeMinutes minutes. Start this after first two
+      // scenarios have completed.
       highLoad: {
-        executor: "per-vu-iterations",
+        executor: "constant-vus",
         vus: maxConcurrentUsers,
-        iterations: 3 * highLoadTimeMinutes, // this is iterations per virtual user
-        // add a large buffer to max duration to ensure all requests can complete.
-        maxDuration: `${highLoadTimeMinutes + (Math.ceil(highLoadTimeMinutes * 0.5))}m`,
-        startTime: `${rampUpTimeMinutes}m`,
+        duration: `${highLoadTimeMinutes}m`,
+        startTime: '2m',
       }
     },
     thresholds: {

load-test/scripts/loadTest.js

@@ -7,6 +7,7 @@ import { getRandomId, generateToken } from "./tokenHelpers.js";
 import {
   LONG_REQUEST_MS,
   EXTRA_LONG_REQUEST_MS,
+  MAX_REQUEST_TIME_MS,
   MiniAppType,
   UPLOAD_URL,
   UPLOAD_PARAMS,
@@ -18,15 +19,11 @@ import {
 // Change these options to increase the user goal or time to run the test.
 export const options = getTestOptions(
   /* User goal */ 1000,
-  /* Ramp up time minutes */ 5,
   /* High load time minutes */ 10
 );
 
 // Change this to test different code
 const sourceToTest = helloWorld;
-// Timeout is we go greater than the max request time to ensure we stay
-// close to our concurrent user goal.
-const MAX_REQUEST_TIME_MS = 20000;
 
 const exceptionCounter = new Counter("exceptions");
 const errorCounter = new Counter("errors");
@@ -99,6 +96,8 @@ function onSocketConnect(socket, requestStartTime, websocketStartTime, sessionId
       timeoutCounter.add(1);
     }
 
+    // Sleep this VU if we are under the max request time. This is so we maintain
+    // a reasonable number of total requests across all virtual users.
     const sleepTime = Math.floor((MAX_REQUEST_TIME_MS - totalTime) / 1000);
     if (sleepTime > 0) {
       sleep(sleepTime);