fix benchmark, refs #32456

roles/bench-server/defaults/main.yml

@@ -3,6 +3,9 @@
 bench_server_packages:
   - ubicast-benchmark
 
+bench_server: 127.0.0.1
+bench_time_stat: 15000
+
 bench_host: "{{ envsetup_ms_server_name | d() }}"
 bench_user: ubicast
 bench_password: "{{ envsetup_ms_superuser_pwd | d() }}"

roles/bench-server/handlers/main.yml

----
-
-- name: reload systemd daemon
-  systemd:
-    daemon_reload: true
-
-- name: restart bench-server
-  systemd:
-    name: bench-server
-    state: restarted
-
-...

roles/bench-server/tasks/main.yml

@@ -6,29 +6,32 @@
     name: "{{ bench_server_packages }}"
     state: present
 
-- name: deploy bench-server service
-  notify:
-    - reload systemd daemon
-    - restart bench-server
-  template:
-    src: bench-server.service.j2
-    dest: /etc/systemd/system/bench-server.service
-
 - name: ensure configuration directory exists
   file:
     path: /etc/mediaserver
     state: directory
 
 - name: benchmark configuration settings
-  notify:
-    - restart bench-server
   copy:
-    dest: /etc/mediaserver/bench.conf
+    dest: /etc/mediaserver/bench-conf.json
     content: |
-      BENCH_HOST=https://{{ bench_host }}
-      BENCH_USER={{ bench_user }}
-      BENCH_PASSWORD={{ bench_password }}
-      BENCH_OID={{ bench_oid }}
+      {
+      "LOCUST_HOST":"{{ bench_server }}",
+      "MS_HOST":"{{ bench_host }}",
+      "MS_USERNAME":"{{ bench_user }}",
+      "MS_PASSWORD":"{{ bench_password }}",
+      "MEDIA_OID":"{{ bench_oid }}",
+      "TIME_STATS":{{ bench_time_stat }}
+      }
+
+- name: reload systemd daemon
+  systemd:
+    daemon_reload: true
+
+- name: restart bench-server
+  systemd:
+    name: bench-server
+    state: restarted
 
 - name: clone ms-testing-suite repository
   git:

roles/bench-server/templates/bench-server.service.j2

-[Unit]
-Description=Benchmark server
-
-[Service]
-Type=simple
-User=root
-Group=root
-EnvironmentFile=/etc/mediaserver/bench.conf
-ExecStart=/usr/bin/mediaserver-bench --host {{ bench_host }} -v -u {{ bench_user }} -p {{ bench_password }} --oid {{ bench_oid }}

roles/bench-worker/handlers/main.yml

----
-
-- name: reload systemd daemon
-  systemd:
-    daemon_reload: true
-
-- name: restart bench-worker
-  systemd:
-    name: bench-worker
-    state: restarted
-
-...

roles/bench-worker/tasks/main.yml

@@ -6,37 +6,31 @@
     name: "{{ bench_worker_packages }}"
     state: present
 
-- name: deploy worker launcher
-  notify:
-    - reload systemd daemon
-    - restart bench-worker
-  template:
-    src: mediaserver-benchmark-start.j2
-    dest: /usr/bin/mediaserver-benchmark-start
-    mode: 0755
-
-- name: deploy bench-worker service
-  notify: restart bench-worker
-  template:
-    src: bench-worker.service.j2
-    dest: /etc/systemd/system/bench-worker.service
-
 - name: ensure configuration directory exists
   file:
     path: /etc/mediaserver
     state: directory
 
 - name: benchmark configuration settings
-  notify:
-    - restart bench-worker
   copy:
-    dest: /etc/mediaserver/bench.conf
+    dest: /etc/mediaserver/bench-conf.json
     content: |
-      BENCH_SERVER={{ bench_server }}
-      BENCH_HOST=https://{{ bench_host }}
-      BENCH_USER={{ bench_user }}
-      BENCH_PASSWORD={{ bench_password }}
-      BENCH_OID={{ bench_oid }}
-      BENCH_TIME_STAT={{ bench_time_stat }}
+      {
+      "LOCUST_HOST":"{{ bench_server }}",
+      "MS_HOST":"{{ bench_host }}",
+      "MS_USERNAME":"{{ bench_user }}",
+      "MS_PASSWORD":"{{ bench_password }}",
+      "MEDIA_OID":"{{ bench_oid }}",
+      "TIME_STATS":{{ bench_time_stat }}
+      }
+
+- name: reload systemd daemon
+  systemd:
+    daemon_reload: true
+
+- name: restart bench-worker
+  systemd:
+    name: bench-worker
+    state: restarted
 
 ...

roles/bench-worker/templates/bench-worker.service.j2

-[Unit]
-Description=Benchmark worker
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-User=root
-Group=root
-EnvironmentFile=/etc/mediaserver/bench.conf
-ExecStart=/usr/bin/mediaserver-benchmark-start
-ExecStop=/usr/bin/pkill -9 locust

roles/bench-worker/templates/mediaserver-benchmark-start.j2

-#!/bin/bash
-
-END=($(nproc))
-echo "Launching $END clients"
-for (( c=0; c<$END; c++ )); do
-    mediaserver-bench --host $BENCH_HOST --master-host $BENCH_SERVER -v -u $BENCH_USER -p $BENCH_PASSWORD --oid $BENCH_OID --time-stat $BENCH_TIME_STAT --no-stream &
-done