diff --git a/etc/octavia.conf b/etc/octavia.conf index db3b64f6a6..da7a7466fd 100644 --- a/etc/octavia.conf +++ b/etc/octavia.conf @@ -317,7 +317,7 @@ # agent_server_network_dir = # agent_server_network_file = -# agent_request_read_timeout = 120 +# agent_request_read_timeout = 180 # Amphora default UDP driver is keepalived_lvs # diff --git a/octavia/amphorae/backends/agent/api_server/osutils.py b/octavia/amphorae/backends/agent/api_server/osutils.py index ece7b3dd6e..d5746baf13 100644 --- a/octavia/amphorae/backends/agent/api_server/osutils.py +++ b/octavia/amphorae/backends/agent/api_server/osutils.py @@ -81,19 +81,19 @@ class BaseOS(object): # interfaces and scripts. try: os.makedirs('/etc/netns/' + consts.AMPHORA_NAMESPACE) + + shutil.copytree( + network_dir, + '/etc/netns/{netns}/{net_dir}'.format( + netns=consts.AMPHORA_NAMESPACE, + net_dir=netns_network_dir), + symlinks=True, + ignore=ignore) except OSError as e: # Raise the error if it's not "File exists" otherwise pass if e.errno != errno.EEXIST: raise - shutil.copytree( - network_dir, - '/etc/netns/{netns}/{net_dir}'.format( - netns=consts.AMPHORA_NAMESPACE, - net_dir=netns_network_dir), - symlinks=True, - ignore=ignore) - def write_vip_interface_file(self, interface_file_path, primary_interface, vip, ip, broadcast, netmask, gateway, mtu, vrrp_ip, vrrp_version, diff --git a/octavia/common/config.py b/octavia/common/config.py index 6cb0aa78eb..d24c7ad671 100644 --- a/octavia/common/config.py +++ b/octavia/common/config.py @@ -111,7 +111,7 @@ amphora_agent_opts = [ help=_("The file where the network interfaces are located. " "Specifying this will override any value set for " "agent_server_network_dir.")), - cfg.IntOpt('agent_request_read_timeout', default=120, + cfg.IntOpt('agent_request_read_timeout', default=180, help=_("The time in seconds to allow a request from the " "controller to run before terminating the socket.")), # Do not specify in octavia.conf, loaded at runtime diff --git a/octavia/tests/unit/amphorae/backends/agent/test_agent_jinja_cfg.py b/octavia/tests/unit/amphorae/backends/agent/test_agent_jinja_cfg.py index 33d380ca29..852e9a7138 100644 --- a/octavia/tests/unit/amphorae/backends/agent/test_agent_jinja_cfg.py +++ b/octavia/tests/unit/amphorae/backends/agent/test_agent_jinja_cfg.py @@ -79,7 +79,7 @@ class AgentJinjaTestCase(base.TestCase): '/etc/octavia/certs/server.pem\n' 'agent_server_network_dir = ' '/etc/network/interfaces.d/\n' - 'agent_request_read_timeout = 120\n' + 'agent_request_read_timeout = 180\n' 'amphora_id = ' + AMP_ID + '\n' 'amphora_udp_driver = keepalived_lvs\n\n' '[controller_worker]\n' @@ -117,7 +117,7 @@ class AgentJinjaTestCase(base.TestCase): '/etc/network/interfaces.d/\n' 'agent_server_network_file = ' '/etc/network/interfaces\n' - 'agent_request_read_timeout = 120\n' + 'agent_request_read_timeout = 180\n' 'amphora_id = ' + AMP_ID + '\n' 'amphora_udp_driver = keepalived_lvs\n\n' '[controller_worker]\n' @@ -155,7 +155,7 @@ class AgentJinjaTestCase(base.TestCase): '/etc/octavia/certs/server.pem\n' 'agent_server_network_dir = ' '/etc/network/interfaces.d/\n' - 'agent_request_read_timeout = 120\n' + 'agent_request_read_timeout = 180\n' 'amphora_id = ' + AMP_ID + '\n' 'amphora_udp_driver = new_udp_driver\n\n' '[controller_worker]\n'