vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Enable connection pooling in the registry

Browse source
This commit is contained in:
Joseph Schorr 2017-07-27 13:55:50 -04:00
parent 67e7e8274b
commit f79542fefb
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
conf/init/service/gunicorn_registry/run
View file

@ -4,6 +4,7 @@ echo 'Starting gunicon'
QUAYPATH=${QUAYPATH:-"."} QUAYPATH=${QUAYPATH:-"."}
QUAYCONF=${QUAYCONF:-"$QUAYPATH/conf"} QUAYCONF=${QUAYCONF:-"$QUAYPATH/conf"}
DB_CONNECTION_POOLING=${DB_CONNECTION_POOLING:-"true"}
cd ${QUAYDIR:-"/"} cd ${QUAYDIR:-"/"}
PYTHONPATH=$QUAYPATH nice -n 10 venv/bin/gunicorn -c $QUAYCONF/gunicorn_registry.py registry:application PYTHONPATH=$QUAYPATH nice -n 10 venv/bin/gunicorn -c $QUAYCONF/gunicorn_registry.py registry:application

22
data/database.py
View file

@ -6,9 +6,10 @@ import string
import sys import sys
import time import time
import uuid import uuid
import os
from contextlib import contextmanager from contextlib import contextmanager
from collections import defaultdict from collections import defaultdict, namedtuple
from datetime import datetime from datetime import datetime
from random import SystemRandom from random import SystemRandom
@ -17,6 +18,7 @@ import toposort
from enum import Enum from enum import Enum
from peewee import * from peewee import *
from playhouse.shortcuts import RetryOperationalError from playhouse.shortcuts import RetryOperationalError
from playhouse.pool import PooledMySQLDatabase, PooledPostgresqlDatabase, PooledSqliteDatabase
from sqlalchemy.engine.url import make_url from sqlalchemy.engine.url import make_url
@ -39,13 +41,14 @@ DEFAULT_DB_CONNECT_TIMEOUT = 10 # seconds
# image has not yet been scanned. # image has not yet been scanned.
IMAGE_NOT_SCANNED_ENGINE_VERSION = -1 IMAGE_NOT_SCANNED_ENGINE_VERSION = -1
schemedriver = namedtuple('schemedriver', ['driver', 'pooled_driver'])
_SCHEME_DRIVERS = { _SCHEME_DRIVERS = {
'mysql': MySQLDatabase, 'mysql': schemedriver(MySQLDatabase, PooledMySQLDatabase),
'mysql+pymysql': MySQLDatabase, 'mysql+pymysql': schemedriver(MySQLDatabase, PooledMySQLDatabase),
'sqlite': SqliteDatabase, 'sqlite': schemedriver(SqliteDatabase, PooledSqliteDatabase),
'postgresql': PostgresqlDatabase, 'postgresql': schemedriver(PostgresqlDatabase, PooledPostgresqlDatabase),
'postgresql+psycopg2': PostgresqlDatabase, 'postgresql+psycopg2': schemedriver(PostgresqlDatabase, PooledPostgresqlDatabase),
} }
@ -269,7 +272,12 @@ def _db_from_url(url, db_kwargs, connect_timeout=DEFAULT_DB_CONNECT_TIMEOUT):
if parsed_url.drivername != 'sqlite': if parsed_url.drivername != 'sqlite':
db_kwargs['connect_timeout'] = db_kwargs.get('connect_timeout', connect_timeout) db_kwargs['connect_timeout'] = db_kwargs.get('connect_timeout', connect_timeout)
driver = _SCHEME_DRIVERS[parsed_url.drivername] drivers = _SCHEME_DRIVERS[parsed_url.drivername]
driver = drivers.driver
if os.getenv('DB_CONNECTION_POOLING', 'false').lower() == 'true':
logger.debug('Connection pooling enabled')
driver = drivers.pooled_driver
wrapped_driver = _wrap_for_retry(driver) wrapped_driver = _wrap_for_retry(driver)
return wrapped_driver(parsed_url.database, **db_kwargs) return wrapped_driver(parsed_url.database, **db_kwargs)