switch back to mysql pool

lib/settings_base.py

@@ -79,8 +79,6 @@ MARKETPLACE_EMAIL = 'marketplace-staff@mozilla.org'
 ABUSE_EMAIL = 'marketplace-staff+abuse@mozilla.org'
 NOBODY_EMAIL = 'nobody@mozilla.org'
 
-CONN_MAX_AGE = 60
-
 DATABASES = {
     'default': {
         'NAME': 'zamboni',

requirements/compiled.txt

@@ -1,6 +1,5 @@
 Jinja2==2.7.2
 MarkupSafe==0.18
-MySQL-python==1.2.5
 lxml==2.2.6
 Pillow==2.3.0
 

requirements/prod.txt

@@ -114,6 +114,7 @@ suds==0.4
 -e git+https://github.com/andymckay/django-piston-oauth2.git@177aaf937860318af8d9c2bb74adc27860803eb9#egg=django-piston-oauth2
 -e git+https://github.com/kumar303/django-qunit.git@b0f468dcf33439488158c845df37ef3261852b55#egg=django-qunit
 -e git+https://github.com/andymckay/django-uuidfield.git@029dd1263794ec36c327617cd6c2346da81c8c33#egg=django-uuidfield
+-e git+https://github.com/washort/django-mysql-pool.git@47b7bc35a7b00a9798d4fe4792764ab00bfcb5b6#egg=django-mysql-pool
 
 
 ## Out of date or not sure on pypi.
@@ -122,3 +123,6 @@ suds==0.4
 
 # Fix bug 963188. Once a version above 1.3.0 is available, move back to a PyPI release.
 -e git+https://github.com/nose-devs/nose.git@79102e33fda8a67292e7c79aafea85ea74334288#egg=nose-dev
+
+## moved for 2014/04/02 deployment expediency
+MySQL-python==1.2.5

scripts/build.sh

@@ -74,6 +74,7 @@ LOG_LEVEL = logging.ERROR
 DATABASES['default']['NAME'] = 'zamboni_$1'
 DATABASES['default']['HOST'] = 'localhost'
 DATABASES['default']['USER'] = 'hudson'
+DATABASES['default']['ENGINE'] = 'mysql_pool'
 DATABASES['default']['TEST_NAME'] = 'test_zamboni_$1'
 DATABASES['default']['TEST_CHARSET'] = 'utf8'
 DATABASES['default']['TEST_COLLATION'] = 'utf8_general_ci'

scripts/run_mkt_tests.sh

@@ -69,6 +69,7 @@ LOG_LEVEL = logging.ERROR
 DATABASES['default']['NAME'] = 'zamboni_$1'
 DATABASES['default']['HOST'] = 'localhost'
 DATABASES['default']['USER'] = 'hudson'
+DATABASES['default']['ENGINE'] = 'mysql_pool'
 DATABASES['default']['TEST_NAME'] = 'test_zamboni_$1'
 DATABASES['default']['TEST_CHARSET'] = 'utf8'
 DATABASES['default']['TEST_COLLATION'] = 'utf8_general_ci'

sites/altdev/settings_base.py

@@ -25,12 +25,20 @@ ADMINS = ()
 
 DATABASES = {}
 DATABASES['default'] = dj_database_url.parse(private.DATABASES_DEFAULT_URL)
+DATABASES['default']['ENGINE'] = 'mysql_pool'
 DATABASES['default']['OPTIONS'] = {'init_command': 'SET storage_engine=InnoDB'}
 
 DATABASES['slave'] = dj_database_url.parse(private.DATABASES_SLAVE_URL)
+DATABASES['slave']['ENGINE'] = 'mysql_pool'
 DATABASES['slave']['OPTIONS'] = {'init_command': 'SET storage_engine=InnoDB'}
 DATABASES['slave']['sa_pool_key'] = 'slave'
 
+DATABASE_POOL_ARGS = {
+    'max_overflow': 10,
+    'pool_size': 5,
+    'recycle': 30
+}
+
 SERVICES_DATABASE = dj_database_url.parse(private.SERVICES_DATABASE_URL)
 
 SLAVE_DATABASES = ['slave']

sites/dev/settings_base.py

@@ -27,12 +27,20 @@ ADMINS = ()
 
 DATABASES = {}
 DATABASES['default'] = dj_database_url.parse(private.DATABASES_DEFAULT_URL)
+DATABASES['default']['ENGINE'] = 'mysql_pool'
 DATABASES['default']['OPTIONS'] = {'init_command': 'SET storage_engine=InnoDB'}
 
 DATABASES['slave'] = dj_database_url.parse(private.DATABASES_SLAVE_URL)
+DATABASES['slave']['ENGINE'] = 'mysql_pool'
 DATABASES['slave']['OPTIONS'] = {'init_command': 'SET storage_engine=InnoDB'}
 DATABASES['slave']['sa_pool_key'] = 'slave'
 
+DATABASE_POOL_ARGS = {
+    'max_overflow': 10,
+    'pool_size': 5,
+    'recycle': 30
+}
+
 SERVICES_DATABASE = dj_database_url.parse(private.SERVICES_DATABASE_URL)
 
 SLAVE_DATABASES = ['slave']

sites/identitystage/settings_base.py

@@ -25,13 +25,21 @@ ADMINS = ()
 
 DATABASES = {}
 DATABASES['default'] = dj_database_url.parse(private.DATABASES_DEFAULT_URL)
+DATABASES['default']['ENGINE'] = 'mysql_pool'
 DATABASES['default']['OPTIONS'] = {'init_command': 'SET storage_engine=InnoDB'}
 
 DATABASES['slave'] = dj_database_url.parse(private.DATABASES_SLAVE_URL)
+DATABASES['slave']['ENGINE'] = 'mysql_pool'
 DATABASES['slave']['OPTIONS'] = {'init_command': 'SET storage_engine=InnoDB'}
 
 SERVICES_DATABASE = dj_database_url.parse(private.SERVICES_DATABASE_URL)
 
+DATABASE_POOL_ARGS = {
+    'max_overflow': 10,
+    'pool_size': 5,
+    'recycle': 30
+}
+
 SLAVE_DATABASES = ['slave']
 
 CACHES = {

sites/landfill/settings_base.py

@@ -25,12 +25,23 @@ ADMINS = ()
 
 DATABASES = {}
 DATABASES['default'] = dj_database_url.parse(private.DATABASES_DEFAULT_URL)
+DATABASES['default']['ENGINE'] = 'mysql_pool'
+DATABASES['default']['sa_pool_key'] = 'master'
 DATABASES['default']['OPTIONS'] = {'init_command': 'SET storage_engine=InnoDB'}
 
 DATABASES['slave'] = dj_database_url.parse(private.DATABASES_SLAVE_URL)
+DATABASES['slave']['ENGINE'] = 'mysql_pool'
 DATABASES['slave']['OPTIONS'] = {'init_command': 'SET storage_engine=InnoDB'}
+DATABASES['slave']['sa_pool_key'] = 'slave'
 
 SERVICES_DATABASE = dj_database_url.parse(private.SERVICES_DATABASE_URL)
+
+DATABASE_POOL_ARGS = {
+    'max_overflow': 10,
+    'pool_size': 5,
+    'recycle': 30
+}
+
 SLAVE_DATABASES = ['slave']
 
 CACHES = {

sites/prod/settings_base.py

@@ -24,11 +24,19 @@ ADMINS = ()
 
 DATABASES = {}
 DATABASES['default'] = dj_database_url.parse(private.DATABASES_DEFAULT_URL)
+DATABASES['default']['ENGINE'] = 'mysql_pool'
 DATABASES['default']['OPTIONS'] = {'init_command': 'SET storage_engine=InnoDB'}
 
 DATABASES['slave'] = dj_database_url.parse(private.DATABASES_SLAVE_URL)
+DATABASES['slave']['ENGINE'] = 'mysql_pool'
 DATABASES['slave']['OPTIONS'] = {'init_command': 'SET storage_engine=InnoDB'}
 
+DATABASE_POOL_ARGS = {
+    'max_overflow': 10,
+    'pool_size': 5,
+    'recycle': 300
+}
+
 SERVICES_DATABASE = dj_database_url.parse(private.SERVICES_DATABASE_URL)
 
 SLAVE_DATABASES = ['slave']

sites/stage/settings_base.py

@@ -25,13 +25,21 @@ ADMINS = ()
 
 DATABASES = {}
 DATABASES['default'] = dj_database_url.parse(private.DATABASES_DEFAULT_URL)
+DATABASES['default']['ENGINE'] = 'mysql_pool'
 DATABASES['default']['OPTIONS'] = {'init_command': 'SET storage_engine=InnoDB'}
 
 DATABASES['slave'] = dj_database_url.parse(private.DATABASES_SLAVE_URL)
+DATABASES['slave']['ENGINE'] = 'mysql_pool'
 DATABASES['slave']['OPTIONS'] = {'init_command': 'SET storage_engine=InnoDB'}
 
 SERVICES_DATABASE = dj_database_url.parse(private.SERVICES_DATABASE_URL)
 
+DATABASE_POOL_ARGS = {
+    'max_overflow': 10,
+    'pool_size': 5,
+    'recycle': 30
+}
+
 SLAVE_DATABASES = ['slave']
 
 CACHES = {