diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-18 22:19:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-18 22:19:29 +0000 |
| commit | 758356c512df7f23d112b6ffa6e921991bbae6f6 (patch) | |
| tree | 8ef85a020f7014ec926434f4cda4557db8e6a83c /nova/compute | |
| parent | 8e2460ea5785fe3e97d2aa6fa4ba21e6867a8a47 (diff) | |
| parent | 3fd5b61d892b2690f24a0e6948c9d306885066b8 (diff) | |
Merge "Rename get_lock() to _get_lock()."
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index b0dc50f5a..ac64b3636 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -170,7 +170,7 @@ def checks_instance_lock(function): context=context, instance_uuid=instance_uuid) LOG.info(_("check_instance_lock: arguments: |%(self)s| |%(context)s|") % locals(), context=context, instance_uuid=instance_uuid) - locked = self.get_lock(context, instance_uuid) + locked = self._get_lock(context, instance_uuid) admin = context.is_admin LOG.info(_("check_instance_lock: locked: |%s|"), locked, context=context, instance_uuid=instance_uuid) @@ -1686,7 +1686,7 @@ class ComputeManager(manager.SchedulerDependentManager): @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id()) @wrap_instance_fault - def get_lock(self, context, instance_uuid): + def _get_lock(self, context, instance_uuid): """Return the boolean state of the given instance's lock.""" context = context.elevated() instance_ref = self.db.instance_get_by_uuid(context, instance_uuid) |