Increase default metadata_workers, backlog to 4096

While deployment tools might want to change the number of workers
to match the number of cores (Or some fraction of it), any default
other than 1 should be outright better.

Inspired from 19:34:
https://www.youtube.com/watch?v=AF9r_VQrcJ0

DocImpact
Closes-Bug: #1323005
Change-Id: Ie90000183ae67ff391a23ca3213fd23aef5f4dc5

diff --git a/etc/metadata_agent.ini b/etc/metadata_agent.ini
index 3da20475326f4074903f464ff467d928874f46a4..84442ea1acaf97c228ba25a93b425c52a2430394 100644 (file)
--- a/etc/metadata_agent.ini
+++ b/etc/metadata_agent.ini
@@ -45,11 +45,12 @@ admin_password = %SERVICE_PASSWORD%
 # Location of Metadata Proxy UNIX domain socket
 # metadata_proxy_socket = $state_path/metadata_proxy
 
-# Number of separate worker processes for metadata server
-# metadata_workers = 0
+# Number of separate worker processes for metadata server. Defaults to
+# half the number of CPU cores
+# metadata_workers =
 
 # Number of backlog requests to configure the metadata server socket with
-# metadata_backlog = 128
+# metadata_backlog = 4096
 
 # URL to connect to the cache backend.
 # default_ttl=0 parameter will cause cache entries to never expire.

diff --git a/neutron/agent/metadata/agent.py b/neutron/agent/metadata/agent.py
index bf99326f200a227a6e9611bc3f06afc13bfa880d..e88ac86193defee28abceb5f3bca813888ef26c4 100644 (file)
--- a/neutron/agent/metadata/agent.py
+++ b/neutron/agent/metadata/agent.py
@@ -306,11 +306,11 @@ class UnixDomainMetadataProxy(object):
                    default='$state_path/metadata_proxy',
                    help=_('Location for Metadata Proxy UNIX domain socket')),
         cfg.IntOpt('metadata_workers',
-                   default=0,
+                   default=utils.cpu_count() // 2,
                    help=_('Number of separate worker processes for metadata '
                           'server')),
         cfg.IntOpt('metadata_backlog',
-                   default=128,
+                   default=4096,
                    help=_('Number of backlog requests to configure the '
                           'metadata server socket with'))
     ]

diff --git a/neutron/common/utils.py b/neutron/common/utils.py
index bbb4e3822aa3d3d97c492e4eef23868c74d902b2..4378218e4de026fd70d7162abcf31ed1f1d68985 100644 (file)
--- a/neutron/common/utils.py
+++ b/neutron/common/utils.py
@@ -22,6 +22,7 @@ import datetime
 import functools
 import hashlib
 import logging as std_logging
+import multiprocessing
 import os
 import random
 import signal
@@ -291,3 +292,10 @@ def get_dhcp_agent_device_id(network_id, host):
     local_hostname = host.split('.')[0]
     host_uuid = uuid.uuid5(uuid.NAMESPACE_DNS, str(local_hostname))
     return 'dhcp%s-%s' % (host_uuid, network_id)
+
+
+def cpu_count():
+    try:
+        return multiprocessing.cpu_count()
+    except NotImplementedError:
+        return 1