diff options
| author | Ryan Lucio <rlucio@internap.com> | 2010-12-30 16:21:11 -0800 |
|---|---|---|
| committer | Ryan Lucio <rlucio@internap.com> | 2010-12-30 16:21:11 -0800 |
| commit | 7f27f62e41fd655049574975bd3bf6c5b00e9ccf (patch) | |
| tree | 066e46217a6ce26138c0e67f121c440c9c48bd96 | |
| parent | c1acb68ef54309584816fbf5c93e38266accb2f0 (diff) | |
| download | nova-7f27f62e41fd655049574975bd3bf6c5b00e9ccf.tar.gz nova-7f27f62e41fd655049574975bd3bf6c5b00e9ccf.tar.xz nova-7f27f62e41fd655049574975bd3bf6c5b00e9ccf.zip | |
Converted the pool_recycle setting to be a flag with a default of 3600 seconds
| -rw-r--r-- | nova/db/sqlalchemy/session.py | 4 | ||||
| -rw-r--r-- | nova/flags.py | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/session.py b/nova/db/sqlalchemy/session.py index 5f31743cd..ca23e93d8 100644 --- a/nova/db/sqlalchemy/session.py +++ b/nova/db/sqlalchemy/session.py @@ -36,7 +36,9 @@ def get_session(autocommit=True, expire_on_commit=False): global _MAKER if not _MAKER: if not _ENGINE: - _ENGINE = create_engine(FLAGS.sql_connection, pool_recycle=3600, echo=False) + _ENGINE = create_engine(FLAGS.sql_connection, + pool_recycle=FLAGS.sql_idle_timeout, + echo=False) _MAKER = (sessionmaker(bind=_ENGINE, autocommit=autocommit, expire_on_commit=expire_on_commit)) diff --git a/nova/flags.py b/nova/flags.py index 76a98d35a..338dcbf46 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -260,6 +260,9 @@ DEFINE_string('state_path', os.path.join(os.path.dirname(__file__), '../'), DEFINE_string('sql_connection', 'sqlite:///$state_path/nova.sqlite', 'connection string for sql database') +DEFINE_string('sql_idle_timeout', + '3600', + 'timeout for idle sql database connections') DEFINE_string('compute_manager', 'nova.compute.manager.ComputeManager', 'Manager for compute') |