260b79ed28
Always loading the raw template in situations where we didn't need it -
e.g. in identify_stack, where we just want the name + id (given one of
them), or when getting the summary stack list - uses up DB bandwidth and
memory unnecessarily.
This partially reverts commit 3ab0ede98c
.
* The eager_load option to get_stack() is reinstated, but with the default
flipped to True. In places where we explicitly do not want to load the
template, we pass False.
* stack_get_by_name() no longer eagerly loads the template. There were no
instances of this where we subsequently use the template.
* stack_get_all() acquires an eager_load option, with the default set to
False. Direct users of objects.stack.Stack.get_all() will not eagerly
load by default, but users of engine.stack.Stack.load_all() will get the
template eagerly loaded. This practically always corresponds to what you
want.
Change-Id: I1f156c25ea26322be5b606a61dd77d80cadd65fc
Related-Bug: #1626675
272 lines
12 KiB
Python
272 lines
12 KiB
Python
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import mock
|
|
|
|
from heat.common import exception
|
|
from heat.common import service_utils
|
|
from heat.engine import stack_lock
|
|
from heat.objects import stack as stack_object
|
|
from heat.objects import stack_lock as stack_lock_object
|
|
from heat.tests import common
|
|
from heat.tests import utils
|
|
|
|
|
|
class StackLockTest(common.HeatTestCase):
|
|
def setUp(self):
|
|
super(StackLockTest, self).setUp()
|
|
self.context = utils.dummy_context()
|
|
self.stack_id = "aae01f2d-52ae-47ac-8a0d-3fde3d220fea"
|
|
self.engine_id = service_utils.generate_engine_id()
|
|
stack = mock.MagicMock()
|
|
stack.id = self.stack_id
|
|
stack.name = "test_stack"
|
|
stack.action = "CREATE"
|
|
self.mock_get_by_id = self.patchobject(
|
|
stack_object.Stack, 'get_by_id', return_value=stack)
|
|
|
|
class TestThreadLockException(Exception):
|
|
pass
|
|
|
|
def test_successful_acquire_new_lock(self):
|
|
mock_create = self.patchobject(stack_lock_object.StackLock,
|
|
'create',
|
|
return_value=None)
|
|
|
|
slock = stack_lock.StackLock(self.context, self.stack_id,
|
|
self.engine_id)
|
|
slock.acquire()
|
|
|
|
mock_create.assert_called_once_with(
|
|
self.context, self.stack_id, self.engine_id)
|
|
|
|
def test_failed_acquire_existing_lock_current_engine(self):
|
|
mock_create = self.patchobject(stack_lock_object.StackLock,
|
|
'create',
|
|
return_value=self.engine_id)
|
|
|
|
slock = stack_lock.StackLock(self.context, self.stack_id,
|
|
self.engine_id)
|
|
|
|
self.assertRaises(exception.ActionInProgress, slock.acquire)
|
|
self.mock_get_by_id.assert_called_once_with(
|
|
self.context,
|
|
self.stack_id,
|
|
show_deleted=True,
|
|
eager_load=False)
|
|
mock_create.assert_called_once_with(
|
|
self.context, self.stack_id, self.engine_id)
|
|
|
|
def test_successful_acquire_existing_lock_engine_dead(self):
|
|
mock_create = self.patchobject(stack_lock_object.StackLock,
|
|
'create',
|
|
return_value='fake-engine-id')
|
|
mock_steal = self.patchobject(stack_lock_object.StackLock,
|
|
'steal',
|
|
return_value=None)
|
|
|
|
slock = stack_lock.StackLock(self.context, self.stack_id,
|
|
self.engine_id)
|
|
self.patchobject(service_utils, 'engine_alive', return_value=False)
|
|
slock.acquire()
|
|
|
|
mock_create.assert_called_once_with(
|
|
self.context, self.stack_id, self.engine_id)
|
|
mock_steal.assert_called_once_with(
|
|
self.context, self.stack_id, 'fake-engine-id', self.engine_id)
|
|
|
|
def test_failed_acquire_existing_lock_engine_alive(self):
|
|
mock_create = self.patchobject(stack_lock_object.StackLock,
|
|
'create',
|
|
return_value='fake-engine-id')
|
|
|
|
slock = stack_lock.StackLock(self.context, self.stack_id,
|
|
self.engine_id)
|
|
self.patchobject(service_utils, 'engine_alive', return_value=True)
|
|
self.assertRaises(exception.ActionInProgress, slock.acquire)
|
|
self.mock_get_by_id.assert_called_once_with(
|
|
self.context,
|
|
self.stack_id,
|
|
show_deleted=True,
|
|
eager_load=False)
|
|
|
|
mock_create.assert_called_once_with(
|
|
self.context, self.stack_id, self.engine_id)
|
|
|
|
def test_failed_acquire_existing_lock_engine_dead(self):
|
|
mock_create = self.patchobject(stack_lock_object.StackLock,
|
|
'create',
|
|
return_value='fake-engine-id')
|
|
mock_steal = self.patchobject(stack_lock_object.StackLock,
|
|
'steal',
|
|
return_value='fake-engine-id2')
|
|
|
|
slock = stack_lock.StackLock(self.context, self.stack_id,
|
|
self.engine_id)
|
|
self.patchobject(service_utils, 'engine_alive', return_value=False)
|
|
self.assertRaises(exception.ActionInProgress, slock.acquire)
|
|
self.mock_get_by_id.assert_called_once_with(
|
|
self.context,
|
|
self.stack_id,
|
|
show_deleted=True,
|
|
eager_load=False)
|
|
|
|
mock_create.assert_called_once_with(
|
|
self.context, self.stack_id, self.engine_id)
|
|
mock_steal.assert_called_once_with(
|
|
self.context, self.stack_id, 'fake-engine-id', self.engine_id)
|
|
|
|
def test_successful_acquire_with_retry(self):
|
|
mock_create = self.patchobject(stack_lock_object.StackLock,
|
|
'create',
|
|
return_value='fake-engine-id')
|
|
mock_steal = self.patchobject(stack_lock_object.StackLock,
|
|
'steal',
|
|
side_effect=[True, None])
|
|
|
|
slock = stack_lock.StackLock(self.context, self.stack_id,
|
|
self.engine_id)
|
|
self.patchobject(service_utils, 'engine_alive', return_value=False)
|
|
slock.acquire()
|
|
|
|
mock_create.assert_has_calls(
|
|
[mock.call(self.context, self.stack_id, self.engine_id)] * 2)
|
|
mock_steal.assert_has_calls(
|
|
[mock.call(self.context, self.stack_id,
|
|
'fake-engine-id', self.engine_id)] * 2)
|
|
|
|
def test_failed_acquire_one_retry_only(self):
|
|
mock_create = self.patchobject(stack_lock_object.StackLock,
|
|
'create',
|
|
return_value='fake-engine-id')
|
|
mock_steal = self.patchobject(stack_lock_object.StackLock,
|
|
'steal',
|
|
return_value=True)
|
|
|
|
slock = stack_lock.StackLock(self.context, self.stack_id,
|
|
self.engine_id)
|
|
self.patchobject(service_utils, 'engine_alive', return_value=False)
|
|
self.assertRaises(exception.ActionInProgress, slock.acquire)
|
|
self.mock_get_by_id.assert_called_with(
|
|
self.context,
|
|
self.stack_id,
|
|
show_deleted=True,
|
|
eager_load=False)
|
|
|
|
mock_create.assert_has_calls(
|
|
[mock.call(self.context, self.stack_id, self.engine_id)] * 2)
|
|
mock_steal.assert_has_calls(
|
|
[mock.call(self.context, self.stack_id,
|
|
'fake-engine-id', self.engine_id)] * 2)
|
|
|
|
def test_context_mgr_exception(self):
|
|
stack_lock_object.StackLock.create = mock.Mock(return_value=None)
|
|
stack_lock_object.StackLock.release = mock.Mock(return_value=None)
|
|
slock = stack_lock.StackLock(self.context, self.stack_id,
|
|
self.engine_id)
|
|
|
|
def check_lock():
|
|
with slock:
|
|
self.assertEqual(1,
|
|
stack_lock_object.StackLock.create.call_count)
|
|
raise self.TestThreadLockException
|
|
self.assertRaises(self.TestThreadLockException, check_lock)
|
|
self.assertEqual(1, stack_lock_object.StackLock.release.call_count)
|
|
|
|
def test_context_mgr_noexception(self):
|
|
stack_lock_object.StackLock.create = mock.Mock(return_value=None)
|
|
stack_lock_object.StackLock.release = mock.Mock(return_value=None)
|
|
slock = stack_lock.StackLock(self.context, self.stack_id,
|
|
self.engine_id)
|
|
|
|
with slock:
|
|
self.assertEqual(1,
|
|
stack_lock_object.StackLock.create.call_count)
|
|
|
|
self.assertEqual(1, stack_lock_object.StackLock.release.call_count)
|
|
|
|
def test_thread_lock_context_mgr_exception_acquire_success(self):
|
|
stack_lock_object.StackLock.create = mock.Mock(return_value=None)
|
|
stack_lock_object.StackLock.release = mock.Mock(return_value=None)
|
|
slock = stack_lock.StackLock(self.context, self.stack_id,
|
|
self.engine_id)
|
|
|
|
def check_thread_lock():
|
|
with slock.thread_lock():
|
|
self.assertEqual(1,
|
|
stack_lock_object.StackLock.create.call_count)
|
|
raise self.TestThreadLockException
|
|
self.assertRaises(self.TestThreadLockException, check_thread_lock)
|
|
self.assertEqual(1, stack_lock_object.StackLock.release.call_count)
|
|
|
|
def test_thread_lock_context_mgr_exception_acquire_fail(self):
|
|
stack_lock_object.StackLock.create = mock.Mock(
|
|
return_value=self.engine_id)
|
|
stack_lock_object.StackLock.release = mock.Mock()
|
|
slock = stack_lock.StackLock(self.context, self.stack_id,
|
|
self.engine_id)
|
|
|
|
def check_thread_lock():
|
|
with slock.thread_lock():
|
|
self.assertEqual(1,
|
|
stack_lock_object.StackLock.create.call_count)
|
|
raise exception.ActionInProgress
|
|
self.assertRaises(exception.ActionInProgress, check_thread_lock)
|
|
self.assertFalse(stack_lock_object.StackLock.release.called)
|
|
|
|
def test_thread_lock_context_mgr_no_exception(self):
|
|
stack_lock_object.StackLock.create = mock.Mock(return_value=None)
|
|
stack_lock_object.StackLock.release = mock.Mock(return_value=None)
|
|
slock = stack_lock.StackLock(self.context, self.stack_id,
|
|
self.engine_id)
|
|
with slock.thread_lock():
|
|
self.assertEqual(1, stack_lock_object.StackLock.create.call_count)
|
|
self.assertFalse(stack_lock_object.StackLock.release.called)
|
|
|
|
def test_try_thread_lock_context_mgr_exception(self):
|
|
stack_lock_object.StackLock.create = mock.Mock(return_value=None)
|
|
stack_lock_object.StackLock.release = mock.Mock(return_value=None)
|
|
slock = stack_lock.StackLock(self.context, self.stack_id,
|
|
self.engine_id)
|
|
|
|
def check_thread_lock():
|
|
with slock.try_thread_lock():
|
|
self.assertEqual(1,
|
|
stack_lock_object.StackLock.create.call_count)
|
|
raise self.TestThreadLockException
|
|
self.assertRaises(self.TestThreadLockException, check_thread_lock)
|
|
self.assertEqual(1, stack_lock_object.StackLock.release.call_count)
|
|
|
|
def test_try_thread_lock_context_mgr_no_exception(self):
|
|
stack_lock_object.StackLock.create = mock.Mock(return_value=None)
|
|
stack_lock_object.StackLock.release = mock.Mock(return_value=None)
|
|
slock = stack_lock.StackLock(self.context, self.stack_id,
|
|
self.engine_id)
|
|
with slock.try_thread_lock():
|
|
self.assertEqual(1, stack_lock_object.StackLock.create.call_count)
|
|
self.assertFalse(stack_lock_object.StackLock.release.called)
|
|
|
|
def test_try_thread_lock_context_mgr_existing_lock(self):
|
|
stack_lock_object.StackLock.create = mock.Mock(return_value=1234)
|
|
stack_lock_object.StackLock.release = mock.Mock(return_value=None)
|
|
slock = stack_lock.StackLock(self.context, self.stack_id,
|
|
self.engine_id)
|
|
|
|
def check_thread_lock():
|
|
with slock.try_thread_lock():
|
|
self.assertEqual(1,
|
|
stack_lock_object.StackLock.create.call_count)
|
|
raise self.TestThreadLockException
|
|
self.assertRaises(self.TestThreadLockException, check_thread_lock)
|
|
self.assertFalse(stack_lock_object.StackLock.release.called)
|