Move master_port_alts from 40000 to 25000 so they don't overlap with ephemeral ports

site_config/config_default.py

 # Copyright 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Seeds a number of variables defined in chromium_config.py.
 
 The recommended way is to fork this file and use a custom DEPS forked from
 config/XXX/DEPS with the right configuration data."""
 
 import os
 import re
 import socket
 
 
 SERVICE_ACCOUNTS_PATH = '/creds/service_accounts'
 
 
 class classproperty(object):
   """A decorator that allows is_production_host to only to be defined once."""
   def __init__(self, getter):
     self.getter = getter
   def __get__(self, instance, owner):
     return self.getter(owner)
 
 
+class PortRange(object):
+  def __init__(self, start, end):
+    self.start = start
+    self.end = end
+
+  def compose_port(self, offset):
+    return self.start + offset
+
+  def contains(self, port):

[dnj (Google), 2016/02/12 01:10:06]

Maybe use this in "compose_port" to assert that the generated port fits in the
range?

[dsansome, 2016/02/12 02:29:13]

Done.

+    return port >= self.start and port <= self.end
+
+  def offset_of(self, port):
+    return port - self.start
+
+
 class Master(object):
   # Repository URLs used by the SVNPoller and 'gclient config'.
   server_url = 'http://src.chromium.org'
   repo_root = '/svn'
   git_server_url = 'https://chromium.googlesource.com'
 
   # External repos.
   googlecode_url = 'http://%s.googlecode.com/svn'
   sourceforge_url = 'https://svn.code.sf.net/p/%(repo)s/code'
   googlecode_revlinktmpl = 'https://code.google.com/p/%s/source/browse?r=%s'
@@ skipping 28 matching lines @@
   git_internal_server_url = None
   syzygy_internal_url = None
   v8_internal_url = None
 
 
   class Base(object):
     """Master base template.
     Contains stubs for variables that all masters must define."""
 
     # Base service offset for 'master_port'
-    MASTER_PORT = 2
+    MASTER_PORT_RANGE = PortRange(20000, 24999)
     # Base service offset for 'slave_port'
-    SLAVE_PORT = 3
+    SLAVE_PORT_RANGE = PortRange(30000, 34999)
     # Base service offset for 'master_port_alt'
-    MASTER_PORT_ALT = 4
+    MASTER_PORT_ALT_RANGE = PortRange(25000, 29999)
     # Base service offset for 'try_job_port'
-    TRY_JOB_PORT = 5
+    TRY_JOB_PORT_RANGE = PortRange(50000, 54999)
 
     # A BuildBucket bucket to poll.
     buildbucket_bucket = None
 
     # Master address. You should probably copy this file in another svn repo
     # so you can override this value on both the slaves and the master.
     master_host = 'localhost'
     @classproperty
     def current_host(cls):
       return socket.getfqdn()
     @classproperty
     def in_production(cls):
       return re.match(r'master.*\.golo\.chromium\.org', cls.current_host)
     # Only report that we are running on a master if the master_host (even when
     # master_host is overridden by a subclass) is the same as the current host.
     @classproperty
     def is_production_host(cls):
       return cls.current_host == cls.master_host
 
     # 'from:' field for emails sent from the server.
     from_address = 'nobody@example.com'
     # Additional email addresses to send gatekeeper (automatic tree closage)
     # notifications. Unnecessary for experimental masters and try servers.
     tree_closing_notification_recipients = []
 
     @classproperty
     def master_port(cls):
-      return cls._compose_port(cls.MASTER_PORT)
+      return cls._compose_port(cls.MASTER_PORT_RANGE)
 
     @classproperty
     def slave_port(cls):
       # Which port slaves use to connect to the master.
-      return cls._compose_port(cls.SLAVE_PORT)
+      return cls._compose_port(cls.SLAVE_PORT_RANGE)
 
     @classproperty
     def master_port_alt(cls):
       # The alternate read-only page. Optional.
-      return cls._compose_port(cls.MASTER_PORT_ALT)
+      return cls._compose_port(cls.MASTER_PORT_ALT_RANGE)
 
     @classproperty
     def try_job_port(cls):
-      return cls._compose_port(cls.TRY_JOB_PORT)
+      return cls._compose_port(cls.TRY_JOB_PORT_RANGE)
 
     @classmethod
-    def _compose_port(cls, service):
+    def _compose_port(cls, service_range):
       """Returns: The port number for 'service' from the master's static config.
 
       Port numbers are mapped of the form:
-      XYYZZ
-      || \__The last two digits identify the master, e.g. master.chromium
-      |\____The second and third digits identify the master host, e.g.
-      |     master1.golo
-      \_____The first digit identifies the port type, e.g. master_port
+      offset + YYZZ
+      |        | \__The last two digits identify the master, e.g.
+      |        |    master.chromium
+      |        \____The second and third digits identify the master host, e.g.
+      |             master1.golo
+      \_____________The offset determines the port type, eg. master_port.  It
+                    comes from the service_range.
 
       If any configuration is missing (incremental migration), this method will
       return '0' for that query, indicating no port.
       """
-      return (
-          (service * 10000) + # X
+      return service_range.compose_port(
           (cls.master_port_base * 100) + # YY
           cls.master_port_id) # ZZ
 
     service_account_file = None
 
     @classproperty
     def service_account_path(cls):
       if cls.service_account_file is None:
         return None
       return os.path.join(SERVICE_ACCOUNTS_PATH, cls.service_account_file)
@@ skipping 71 matching lines @@
     tree_status_url = base_app_url + '/status'
     store_revisions_url = base_app_url + '/revisions'
     last_good_url = base_app_url + '/lkgr'
 
   class ChromiumOSBase2a(Master2a):
     """Base class for ChromiumOS masters"""
     base_app_url = 'https://chromiumos-status.appspot.com'
     tree_status_url = base_app_url + '/status'
     store_revisions_url = base_app_url + '/revisions'
     last_good_url = base_app_url + '/lkgr'