From fb9b60fb5d3084d4cab29936fd1f534e5599f231 Mon Sep 17 00:00:00 2001 From: Sam Morrison Date: Tue, 22 Apr 2014 16:34:26 +1000 Subject: [PATCH] Remove cell api overrides for lock and unlock This isn't actually needed as these methods handle objects and is triggered when the instance object is saved. It actually caused a race condition with unlock as it triggers 2 instance updates from a compute cell. Change-Id: I42eea6a2984f70527d4fc37f48ad973a2248721c Closes-Bug: #1257168 --- nova/compute/cells_api.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/nova/compute/cells_api.py b/nova/compute/cells_api.py index 81310ab26a80..9be97a2b5316 100644 --- a/nova/compute/cells_api.py +++ b/nova/compute/cells_api.py @@ -392,16 +392,6 @@ class ComputeCellsAPI(compute_api.API): return self._call_to_cells(context, instance, 'get_console_output', *args, **kwargs) - def lock(self, context, instance): - """Lock the given instance.""" - super(ComputeCellsAPI, self).lock(context, instance) - self._cast_to_cells(context, instance, 'lock') - - def unlock(self, context, instance): - """Unlock the given instance.""" - super(ComputeCellsAPI, self).lock(context, instance) - self._cast_to_cells(context, instance, 'unlock') - @check_instance_cell def _attach_volume(self, context, instance, volume_id, device, disk_bus, device_type):