launchpad-reviewers team mailing list archive

[Colin Watson <mp+429371@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:double-rabbitmq-timeout into launchpad:master.

Commit message:
Double the RabbitMQ setup timeout again

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/429371

We're seeing a lot of `RabbitMQLayer` setup failures in focal test runs, even more than usual.  I suspect something may have changed in rabbitmq-server or Erlang to behave worse under high container concurrency, though it's pretty hard to tell without an expert.  However, successful setups seem to take around 53 seconds (!) on average on buildbot, so 60 seconds seems a bit tight; double it again.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:double-rabbitmq-timeout into launchpad:master.

diff --git a/lib/lp/services/rabbit/tests/test_server.py b/lib/lp/services/rabbit/tests/test_server.py
index d526b1c..aa14ad8 100644
--- a/lib/lp/services/rabbit/tests/test_server.py
+++ b/lib/lp/services/rabbit/tests/test_server.py
@@ -25,7 +25,7 @@ class TestRabbitServer(TestCase):
 
         # The default timeout is 15 seconds, but increase this a bit to
         # allow some more leeway for slow test environments.
-        fixture = self.useFixture(RabbitServer(ctltimeout=60))
+        fixture = self.useFixture(RabbitServer(ctltimeout=120))
         # RabbitServer pokes some .ini configuration into its config.
         service_config = ConfigParser()
         service_config.read_file(io.StringIO(fixture.config.service_config))
diff --git a/lib/lp/testing/layers.py b/lib/lp/testing/layers.py
index 8f42050..0777457 100644
--- a/lib/lp/testing/layers.py
+++ b/lib/lp/testing/layers.py
@@ -643,7 +643,7 @@ class RabbitMQLayer(BaseLayer):
 
     # The default timeout is 15 seconds, but increase this a bit to allow
     # some more leeway for slow test environments.
-    rabbit = RabbitServer(ctltimeout=60)
+    rabbit = RabbitServer(ctltimeout=120)
 
     _is_setup = False