Skip to content

#442 - Fix bug related with locking and ComposedDatabaseOperation #443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 3, 2022
Merged

#442 - Fix bug related with locking and ComposedDatabaseOperation #443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a15cdb
ISSUE #442
May 3, 2022
4f585c5
Merge remote-tracking branch 'origin/0.7.0' into issue-442-fix-lock-c…
May 3, 2022
d18e39f
ISSUE #442
May 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions packages/core/minos-microservice-common/minos/common/database/clients/abc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,14 @@ async def execute(self, operation: DatabaseOperation) -> None:
await self._create_lock(operation.lock)

if isinstance(operation, ComposedDatabaseOperation):
for op in operation.operations:
await wait_for(self._execute(op), operation.timeout)
await wait_for(self._execute_composed(operation), operation.timeout)
else:
await wait_for(self._execute(operation), operation.timeout)

async def _execute_composed(self, operation: ComposedDatabaseOperation) -> None:
for op in operation.operations:
await self.execute(op)

@abstractmethod
async def _execute(self, operation: DatabaseOperation) -> None:
raise NotImplementedError
Expand Down
8 changes: 5 additions & 3 deletions ...s/core/minos-microservice-common/tests/test_common/test_database/test_clients/test_abc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,15 @@ async def test_execute(self):
self.assertEqual([call(operation)], mock.call_args_list)

async def test_execute_composed(self):
mock = AsyncMock()
client = _DatabaseClient()
client._execute = mock
mock = AsyncMock(side_effect=client.execute)
client.execute = mock
composed = ComposedDatabaseOperation([_DatabaseOperation(), _DatabaseOperation()])
await client.execute(composed)

self.assertEqual([call(composed.operations[0]), call(composed.operations[1])], mock.call_args_list)
self.assertEqual(
[call(composed), call(composed.operations[0]), call(composed.operations[1])], mock.call_args_list
)

async def test_execute_with_lock(self):
op1 = _DatabaseOperation(lock="foo")
Expand Down