erp5: Fix bug with too many apache Listen

A regression from !374 is that we made apache listening on one port for each zope backend instance.

/reviewed-on !548

software/erp5/test/test/test_erp5.py

@@ -30,8 +30,10 @@ import json
 import glob
 import urlparse
 import logging
+import socket
 import time
 
+import psutil
 import requests
 
 from utils import SlapOSInstanceTestCase
@@ -95,6 +97,92 @@ class TestDefaultParameters(ERP5TestCase, TestPublishedURLIsReachableMixin):
   __partition_reference__ = 'defp'
 
 
+class TestApacheBalancerPorts(ERP5TestCase):
+  """Instanciate with two zope families, this should create for each family:
+   - a balancer entry point with corresponding haproxy
+   - a balancer entry point for test runner
+  """
+  __partition_reference__ = 'ap'
+
+  @classmethod
+  def getInstanceParameterDict(cls):
+    return {
+        '_':
+            json.dumps({
+                "zope-partition-dict": {
+                    "family1": {
+                        "instance-count": 3,
+                        "family": "family1"
+                    },
+                    "family2": {
+                        "instance-count": 5,
+                        "family": "family2"
+                    },
+                },
+            })
+    }
+
+  def checkValidHTTPSURL(self, url):
+    parsed = urlparse.urlparse(url)
+    self.assertEqual(parsed.scheme, 'https')
+    self.assertTrue(parsed.hostname)
+    self.assertTrue(parsed.port)
+
+  def test_published_family_parameters(self):
+    # when we request two families, we have two published family-{family_name} URLs
+    param_dict = self.getRootPartitionConnectionParameterDict()
+    for family_name in ('family1', 'family2'):
+      self.checkValidHTTPSURL(
+          param_dict['family-{family_name}'.format(family_name=family_name)])
+      self.checkValidHTTPSURL(
+          param_dict['family-{family_name}-v6'.format(family_name=family_name)])
+
+  def test_published_test_runner_url(self):
+    # each family's also a list of test test runner URLs, by default 3 per family
+    param_dict = self.getRootPartitionConnectionParameterDict()
+    for family_name in ('family1', 'family2'):
+      family_test_runner_url_list = param_dict[
+          '{family_name}-test-runner-url-list'.format(family_name=family_name)]
+      self.assertEqual(3, len(family_test_runner_url_list))
+      for url in family_test_runner_url_list:
+        self.checkValidHTTPSURL(url)
+
+  def test_zope_listen(self):
+    # we requested 3 zope in family1 and 5 zopes in family2, we should have 8 zope running.
+    all_process_info = self.getSupervisorRPCServer(
+    ).supervisor.getAllProcessInfo()
+    self.assertEqual(
+        3 + 5,
+        len([p for p in all_process_info if p['name'].startswith('zope-')]))
+
+  def test_apache_listen(self):
+    # We have 2 families, apache should listen to a total of 3 ports per family
+    # normal access on ipv4 and ipv6 and test runner access on ipv4 only
+    all_process_info = self.getSupervisorRPCServer(
+    ).supervisor.getAllProcessInfo()
+    process_info, = [p for p in all_process_info if p['name'] == 'apache']
+    apache_process = psutil.Process(process_info['pid'])
+    self.assertEqual(
+        sorted([socket.AF_INET] * 4 + [socket.AF_INET6] * 2),
+        sorted([
+            c.family
+            for c in apache_process.connections()
+            if c.status == 'LISTEN'
+        ]))
+
+  def test_haproxy_listen(self):
+    # There is one haproxy per family
+    all_process_info = self.getSupervisorRPCServer(
+    ).supervisor.getAllProcessInfo()
+    process_info, = [
+        p for p in all_process_info if p['name'].startswith('haproxy-')
+    ]
+    haproxy_process = psutil.Process(process_info['pid'])
+    self.assertEqual([socket.AF_INET, socket.AF_INET], [
+        c.family for c in haproxy_process.connections() if c.status == 'LISTEN'
+    ])
+
+
 class TestDisableTestRunner(ERP5TestCase, TestPublishedURLIsReachableMixin):
   """Test ERP5 can be instanciated without test runner.
   """
@@ -114,3 +202,17 @@ class TestDisableTestRunner(ERP5TestCase, TestPublishedURLIsReachableMixin):
     self.assertTrue(bin_programs) # just to check the glob was correct.
     self.assertNotIn('runUnitTest', bin_programs)
     self.assertNotIn('runTestSuite', bin_programs)
+
+  def test_no_apache_testrunner_port(self):
+    # Apache only listen on two ports, there is no apache ports allocated for test runner
+    all_process_info = self.getSupervisorRPCServer(
+    ).supervisor.getAllProcessInfo()
+    process_info, = [p for p in all_process_info if p['name'] == 'apache']
+    apache_process = psutil.Process(process_info['pid'])
+    self.assertEqual(
+        sorted([socket.AF_INET, socket.AF_INET6]),
+        sorted([
+            c.family
+            for c in apache_process.connections()
+            if c.status == 'LISTEN'
+        ]))

stack/erp5/buildout.hash.cfg

@@ -90,7 +90,7 @@ md5sum = 3a6c7dec898abc7d1506957154ef566e
 
 [template-balancer]
 filename = instance-balancer.cfg.in
-md5sum = a2f795e5ed9537951ee70114111930b0
+md5sum = 3034ccaa76dbb94f4fe07150a4681843
 
 [template-haproxy-cfg]
 filename = haproxy.cfg.in

stack/erp5/instance-balancer.cfg.in

@@ -55,13 +55,15 @@ mode = 644
 {%       endif -%}
 {%       set zope_effective_address = zope_address -%}
 {%       do zope_family_address_list.append((zope_effective_address, maxconn, webdav)) -%}
+{%     endfor -%}
 
-{#       # Generate entries with rewrite rule for test runnners #}
+{#     # Generate entries with rewrite rule for test runnners #}
+{%     set test_runner_address_list = slapparameter_dict.get(parameter_id ~ '-test-runner-address-list', []) %}
+{%     if test_runner_address_list -%}
 {%       set test_runner_backend_mapping = {} %}
 {%       set test_runner_apache_url_list = [] %}
 {%       set test_runner_external_port = next_port() %}
-{%       for i, (test_runner_internal_ip, test_runner_internal_port) in
-             enumerate(slapparameter_dict.get(parameter_id ~ '-test-runner-address-list', [])) %}
+{%       for i, (test_runner_internal_ip, test_runner_internal_port) in enumerate(test_runner_address_list) %}
 {%         do test_runner_backend_mapping.__setitem__(
                 'unit_test_' ~ i,
                 'http://' ~ test_runner_internal_ip ~ ':' ~ test_runner_internal_port ) %}
@@ -72,8 +74,7 @@ mode = 644
               (ipv4, test_runner_external_port),
               ( ssl_authentication, test_runner_backend_mapping ) ) -%}
 {%       do test_runner_url_dict.__setitem__(family_name, test_runner_apache_url_list) -%}
-
-{%     endfor -%}
+{%     endif -%}
 {%   endfor -%}
 
 {# Make rendering fail artificially if any family has no known backend.