openstack/nova
Code Issues Proposed changes

Fixes LP688545

Browse Source
This commit is contained in:
Josh Kearney 2011-01-03 16:08:52 -06:00
parent 40de3b9ffb
commit 6a8f011789
4 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nova/compute/manager.py
View File

@ -327,6 +327,7 @@ class ComputeManager(manager.Manager):
instance_ref["internal_id"]) instance_ref["internal_id"])
return self.driver.get_diagnostics(instance_ref) return self.driver.get_diagnostics(instance_ref)
@exception.wrap_exception
def suspend_instance(self, context, instance_id): def suspend_instance(self, context, instance_id):
"""suspend the instance with instance_id""" """suspend the instance with instance_id"""
context = context.elevated() context = context.elevated()

21
nova/db/sqlalchemy/__init__.py
View File

@ -19,6 +19,25 @@
""" """
SQLAlchemy database backend SQLAlchemy database backend
""" """
import logging
import time
from sqlalchemy.exc import OperationalError
from nova import flags
from nova.db.sqlalchemy import models from nova.db.sqlalchemy import models
models.register_models()
FLAGS = flags.FLAGS
for i in xrange(FLAGS.sql_max_retries):
if i > 0:
time.sleep(FLAGS.sql_retry_interval)
try:
models.register_models()
break
except OperationalError:
logging.exception(_("Data store is unreachable."
" Trying again in %d seconds.") % FLAGS.sql_retry_interval)

2
nova/flags.py
View File

@ -266,6 +266,8 @@ DEFINE_string('sql_connection',
DEFINE_string('sql_idle_timeout', DEFINE_string('sql_idle_timeout',
'3600', '3600',
'timeout for idle sql database connections') 'timeout for idle sql database connections')
DEFINE_integer('sql_max_retries', 12, 'sql connection attempts')
DEFINE_integer('sql_retry_interval', 10, 'sql connection retry interval')
DEFINE_string('compute_manager', 'nova.compute.manager.ComputeManager', DEFINE_string('compute_manager', 'nova.compute.manager.ComputeManager',
'Manager for compute') 'Manager for compute')

7
nova/tests/test_xenapi.py
View File

@ -250,15 +250,16 @@ class XenAPIVMTestCase(test.TestCase):
def _create_instance(self): def _create_instance(self):
"""Creates and spawns a test instance""" """Creates and spawns a test instance"""
values = {'name': 1, 'id': 1, values = {
'name': 1,
'id': 1,
'project_id': self.project.id, 'project_id': self.project.id,
'user_id': self.user.id, 'user_id': self.user.id,
'image_id': 1, 'image_id': 1,
'kernel_id': 2, 'kernel_id': 2,
'ramdisk_id': 3, 'ramdisk_id': 3,
'instance_type': 'm1.large', 'instance_type': 'm1.large',
'mac_address': 'aa:bb:cc:dd:ee:ff' 'mac_address': 'aa:bb:cc:dd:ee:ff'}
}
instance = db.instance_create(values) instance = db.instance_create(values)
self.conn.spawn(instance) self.conn.spawn(instance)
return instance return instance