balancer: let balancer containers scale when using docker compose (#1431)

* balancer: let balancer containers scale when using docker compose

* adjust response parsing

Author: dyc3

docker/nginx.conf

@@ -0,0 +1,41 @@
+# This configuration is specifically for testing in a development environment.
+# It is not suitable for production use.
+
+worker_processes auto;
+
+events {
+	worker_connections 2048;
+	multi_accept on;
+}
+
+http {
+	map $http_upgrade $connection_upgrade {
+		default upgrade;
+		'' close;
+	}
+
+	server {
+		listen 80 default_server;
+		http2 on;
+
+		location / {
+			proxy_pass http://balancer:8081;
+			proxy_http_version 1.1;
+			proxy_set_header Upgrade $http_upgrade;
+			proxy_set_header Connection "upgrade";
+			proxy_set_header Host $host;
+			proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+			proxy_set_header X-Forwarded-Proto $scheme;
+			proxy_set_header X-Forwarded-Host $host;
+			proxy_cache_bypass $http_upgrade;
+			proxy_pass_header Set-Cookie;
+
+			proxy_connect_timeout 7d;
+			proxy_read_timeout 7d;
+			proxy_send_timeout 7d;
+
+			proxy_socket_keepalive on;
+		}
+	}
+}
+

docker/with-balancer.docker-compose.yml

@@ -37,8 +37,6 @@ services:
       dockerfile: deploy/balancer.Dockerfile
       args:
         - DEPLOY_TARGET=ott-balancer-docker
-    ports:
-      - 8080:8081
     restart: "${DOCKER_RESTART_POLICY:-unless-stopped}"
 
   collector:
@@ -48,8 +46,6 @@ services:
       dockerfile: deploy/collector.Dockerfile
       args:
         - DEPLOY_TARGET=ott-collector-docker
-    links:
-      - balancer
     ports:
       - 8000:8000
     restart: "${DOCKER_RESTART_POLICY:-unless-stopped}"
@@ -81,6 +77,14 @@ services:
       - db-data-postgres:/var/lib/postgresql/data
     restart: "${DOCKER_RESTART_POLICY:-unless-stopped}"
 
+  nginx:
+    image: nginx:alpine
+    volumes:
+      - ./nginx.conf:/etc/nginx/nginx.conf
+    ports:
+      - 8080:80
+    restart: "${DOCKER_RESTART_POLICY:-unless-stopped}"
+
 # shared volume
 volumes:
   db-data-redis:

tests/load/utils.js

@@ -65,11 +65,16 @@ export function createRoom(name, token, roomOptions = {}, options = { doCheck: t
 				if (r.status === 201) {
 					return true;
 				}
-				let body = JSON.parse(r.body);
-				if (body.error && body.error.name === "RoomNameTakenException") {
-					return true;
+				try {
+					let body = JSON.parse(r.body);
+					if (body.error && body.error.name === "RoomNameTakenException") {
+						return true;
+					}
+					return false;
+				} catch (e) {
+					console.log(`Failed to parse response body as json: ${r.body}`);
+					return false;
 				}
-				return false;
 			},
 		});
 	}