From: Aaron Rosen Date: Wed, 29 May 2013 03:38:31 +0000 (-0700) Subject: Add sqlalchemy_pool_size option to default config files X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=67ad85db59987632620e38cfdef7569160339d7d;p=openstack-build%2Fneutron-build.git Add sqlalchemy_pool_size option to default config files This patch exposes the sqlalchemy_pool_size option to config files of plugins that already expose sql_ options besides sql_connection. Fixes bug 1185260 Change-Id: Ifaff02fae5e5349efb992c071adc0b02f10d61a7 --- diff --git a/etc/quantum/plugins/bigswitch/restproxy.ini b/etc/quantum/plugins/bigswitch/restproxy.ini index afe71f466..74a8e619d 100644 --- a/etc/quantum/plugins/bigswitch/restproxy.ini +++ b/etc/quantum/plugins/bigswitch/restproxy.ini @@ -22,6 +22,8 @@ reconnect_interval = 2 # sql_max_pool_size = 5 # Timeout in seconds before idle sql connections are reaped # sql_idle_timeout = 3600 +# Maximum number of SQL connections to keep open in a QueuePool in SQLAlchemy +# sqlalchemy_pool_size = 5 [RESTPROXY] # All configuration for this plugin is in section '[restproxy]' diff --git a/etc/quantum/plugins/brocade/brocade.ini b/etc/quantum/plugins/brocade/brocade.ini index 58589f8ce..05d5b0ea1 100644 --- a/etc/quantum/plugins/brocade/brocade.ini +++ b/etc/quantum/plugins/brocade/brocade.ini @@ -21,6 +21,8 @@ # sql_max_pool_size = 5 # Timeout in seconds before idle sql connections are reaped # sql_idle_timeout = 3600 +# Maximum number of SQL connections to keep open in a QueuePool in SQLAlchemy +# sqlalchemy_pool_size = 5 # # Example: # sql_connection = mysql://root:pass@localhost/brcd_quantum?charset=utf8 diff --git a/etc/quantum/plugins/hyperv/hyperv_quantum_plugin.ini b/etc/quantum/plugins/hyperv/hyperv_quantum_plugin.ini index 97963c802..adc242a09 100644 --- a/etc/quantum/plugins/hyperv/hyperv_quantum_plugin.ini +++ b/etc/quantum/plugins/hyperv/hyperv_quantum_plugin.ini @@ -20,6 +20,8 @@ reconnect_interval = 2 # sql_max_pool_size = 5 # Timeout in seconds before idle sql connections are reaped # sql_idle_timeout = 3600 +# Maximum number of SQL connections to keep open in a QueuePool in SQLAlchemy +# sqlalchemy_pool_size = 5 [HYPERV] # (StrOpt) Type of network to allocate for tenant networks. The diff --git a/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini b/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini index be0bb22a0..efd9a1e9d 100644 --- a/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini +++ b/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini @@ -42,6 +42,8 @@ reconnect_interval = 2 # sql_max_pool_size = 5 # Timeout in seconds before idle sql connections are reaped # sql_idle_timeout = 3600 +# Maximum number of SQL connections to keep open in a QueuePool in SQLAlchemy +# sqlalchemy_pool_size = 5 [LINUX_BRIDGE] # (ListOpt) Comma-separated list of diff --git a/etc/quantum/plugins/metaplugin/metaplugin.ini b/etc/quantum/plugins/metaplugin/metaplugin.ini index bd5770fd9..ede07aa01 100644 --- a/etc/quantum/plugins/metaplugin/metaplugin.ini +++ b/etc/quantum/plugins/metaplugin/metaplugin.ini @@ -22,6 +22,8 @@ reconnect_interval = 2 # sql_max_pool_size = 5 # Timeout in seconds before idle sql connections are reaped # sql_idle_timeout = 3600 +# Maximum number of SQL connections to keep open in a QueuePool in SQLAlchemy +# sqlalchemy_pool_size = 5 [META] ## This is list of flavor:quantum_plugins diff --git a/etc/quantum/plugins/midonet/midonet.ini b/etc/quantum/plugins/midonet/midonet.ini index 885b68799..529ab9a19 100644 --- a/etc/quantum/plugins/midonet/midonet.ini +++ b/etc/quantum/plugins/midonet/midonet.ini @@ -20,6 +20,8 @@ reconnect_interval = 2 # sql_max_pool_size = 5 # Timeout in seconds before idle sql connections are reaped # sql_idle_timeout = 3600 +# Maximum number of SQL connections to keep open in a QueuePool in SQLAlchemy +# sqlalchemy_pool_size = 5 [MIDONET] # MidoNet API server URI diff --git a/etc/quantum/plugins/nec/nec.ini b/etc/quantum/plugins/nec/nec.ini index 9ceb09e1d..a2e9900de 100644 --- a/etc/quantum/plugins/nec/nec.ini +++ b/etc/quantum/plugins/nec/nec.ini @@ -22,6 +22,8 @@ reconnect_interval = 2 # sql_max_pool_size = 5 # Timeout in seconds before idle sql connections are reaped # sql_idle_timeout = 3600 +# Maximum number of SQL connections to keep open in a QueuePool in SQLAlchemy +# sqlalchemy_pool_size = 5 [ovs] # Do not change this parameter unless you have a good reason to. diff --git a/etc/quantum/plugins/nicira/nvp.ini b/etc/quantum/plugins/nicira/nvp.ini index 9eeaf3767..ada807248 100644 --- a/etc/quantum/plugins/nicira/nvp.ini +++ b/etc/quantum/plugins/nicira/nvp.ini @@ -90,6 +90,9 @@ sql_connection = sqlite:// # Timeout in seconds before idle sql connections are reaped # sql_idle_timeout = 3600 +# Maximum number of SQL connections to keep open in a QueuePool in SQLAlchemy +# sqlalchemy_pool_size = 5 + [quotas] # number of network gateways allowed per tenant, -1 means unlimited diff --git a/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini b/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini index 413865302..22d829ad1 100644 --- a/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini +++ b/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini @@ -20,6 +20,8 @@ reconnect_interval = 2 # sql_max_pool_size = 5 # Timeout in seconds before idle sql connections are reaped # sql_idle_timeout = 3600 +# Maximum number of SQL connections to keep open in a QueuePool in SQLAlchemy +# sqlalchemy_pool_size = 5 [ovs] # (StrOpt) Type of network to allocate for tenant networks. The diff --git a/etc/quantum/plugins/plumgrid/plumgrid.ini b/etc/quantum/plugins/plumgrid/plumgrid.ini index 4a1068b22..564427b23 100644 --- a/etc/quantum/plugins/plumgrid/plumgrid.ini +++ b/etc/quantum/plugins/plumgrid/plumgrid.ini @@ -22,6 +22,8 @@ # sql_max_pool_size = 5 # Timeout in seconds before idle sql connections are reaped # sql_idle_timeout = 3600 +# Maximum number of SQL connections to keep open in a QueuePool in SQLAlchemy +# sqlalchemy_pool_size = 5 [PLUMgridNOS] # This line should be pointing to the NOS server, diff --git a/etc/quantum/plugins/ryu/ryu.ini b/etc/quantum/plugins/ryu/ryu.ini index eb4c7ac58..96c3ea460 100644 --- a/etc/quantum/plugins/ryu/ryu.ini +++ b/etc/quantum/plugins/ryu/ryu.ini @@ -12,6 +12,8 @@ sql_connection = sqlite:// # sql_max_pool_size = 5 # Timeout in seconds before idle sql connections are reaped # sql_idle_timeout = 3600 +# Maximum number of SQL connections to keep open in a QueuePool in SQLAlchemy +# sqlalchemy_pool_size = 5 [ovs] integration_bridge = br-int