Merge ~hyask/autopkgtest-cloud:skia/slower_running_state into autopkgtest-cloud:master

[Skia]

This MP fixes the issue with RabbitMQ restarting every 2 hours under high load.

[Tim Andersson (andersson123)]

I had a look at the changes and I like the running page improvements. Feels like it makes a bit more sense now.

I do however have one inline comment regarding the first commit.

review: Needs Fixing

[Skia (hyask)]

Wow, thanks, completely passed over that :-)

[Tim Andersson (andersson123)]

Approve provided CI passes!

review: Approve

diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
index 746ad31..e9bc152 100755
--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
@@ -570,11 +570,11 @@ def call_autopkgtest(
         argv, stdout=null_fd, stderr=subprocess.STDOUT
     )
     # FIXME: Use autopkgtest.wait(timeout=10) once moving to Python 3
-    # only send status update every 10s, but check if program has finished every 1s
+    # only send status update every 30s, but check if program has finished every 1s
     status_update_counter = 0
     while autopkgtest.poll() is None:
         time.sleep(1)
-        status_update_counter = (status_update_counter + 1) % 10
+        status_update_counter = (status_update_counter + 1) % 30
         if status_update_counter == 0:
             send_status_info(
                 status_amqp,
diff --git a/charms/focal/autopkgtest-web/webcontrol/templates/browse-running.html b/charms/focal/autopkgtest-web/webcontrol/templates/browse-running.html
index 48080ce..e0c8a19 100644
--- a/charms/focal/autopkgtest-web/webcontrol/templates/browse-running.html
+++ b/charms/focal/autopkgtest-web/webcontrol/templates/browse-running.html
@@ -2,25 +2,10 @@
 {% import "macros.html" as macros %}
 
 {% block content %}
-  <h1 class="page-header">Currently running tests</h1>
-  {% if running_count != 1 %}
-    <p>There are currently {{running_count}} running tests.</p>
-  {% else %}
-    <p>There is currently {{running_count}} running test.</p>
-  {% endif %}
-  <p>Click on the package name to jump to the currently running tests of that package.</p>
+  <h1 class="page-header">Running and queued tests</h1>
+  <p>The data displayed on this page is refreshed approximately every 30 seconds.</p>
 
-  <table class="table-condensed table-striped">
-    {% for column in running|sort|batch(3) %}
-    <tr>
-      {% for p in column %}
-        <td><a href="#pkg-{{ p }}">{{ p }}</a></td>
-      {% endfor %}
-    </tr>
-    {% endfor %}
-  </table>
-
-  <h3>Queue lengths</h3>
+  <h2>Queue lengths</h2>
   <p>Click on the number in a cell to jump to the list of test requests for
   that release and architecture which are waiting to be run.</p>
 
@@ -43,8 +28,27 @@
   {% endfor %}
 
   <!-- Running tests -->
+  <h2>Running tests</h2>
+  {% if running_count != 1 %}
+    <p>There are currently {{running_count}} running tests.</p>
+  {% else %}
+    <p>There is currently {{running_count}} running test.</p>
+  {% endif %}
+  <p>Click on the package name to jump to the currently running tests of that package.</p>
+  <table class="table-condensed table-striped">
+    {% for column in running|sort|batch(3) %}
+    <tr>
+      {% for p in column %}
+        <td><a href="#pkg-{{ p }}">{{ p }}</a></td>
+      {% endfor %}
+    </tr>
+    {% endfor %}
+  </table>
+
+  <hr>
+
   {% for p, info in running.items()|sort %}
-    <h2 id="pkg-{{ p }}"><a href="/packages/{{ p }}">{{ p }}</a></h2>
+    <h3 id="pkg-{{ p }}"><a href="/packages/{{ p }}">{{ p }}</a></h3>
     {{ macros.display_running_job(p, info) }}
   {% endfor %}