Skip to content
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

Jump to bottom

Change drone state initialisation and notification of plugins #247

Merged
merged 3 commits into from
May 17, 2022
Merged

Change drone state initialisation and notification of plugins #247

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
254c7be
Change drone state initialisation and notification of plugins
giffels May 11, 2022
b0960c5
Added changelog
giffels May 11, 2022
9293713
Explicitly check for state None
giffels May 13, 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
4 changes: 2 additions & 2 deletions docs/source/changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
.. Created by changelog.py at 2022-05-06, command
.. Created by changelog.py at 2022-05-11, command
'/Users/giffler/.cache/pre-commit/repor6pnmwlm/py_env-default/bin/changelog docs/source/changes compile --output=docs/source/changelog.rst'
based on the format of 'https://keepachangelog.com/'

#########
CHANGELOG
#########

[Unreleased] - 2022-05-06
[Unreleased] - 2022-05-11
=========================

Added
Expand Down
2 changes: 1 addition & 1 deletion tardis/plugins/sqliteregistry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def __init__(self):
self._db_file = configuration.Plugins.SqliteRegistry.db_file
self._deploy_db_schema()
self._dispatch_on_state = dict(
BootingState=self.insert_resource, DownState=self.delete_resource
RequestState=self.insert_resource, DownState=self.delete_resource
)

for site in configuration.Sites:
Expand Down
8 changes: 7 additions & 1 deletion tardis/resources/drone.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def __init__(
plugins: Optional[List[Plugin]] = None,
remote_resource_uuid=None,
drone_uuid=None,
state: RequestState = RequestState(),
state: Optional[State] = None,
created: float = None,
updated: float = None,
):
Expand Down Expand Up @@ -93,6 +93,12 @@ def site_agent(self) -> SiteAgent:
return self._site_agent

async def run(self):
if not self.state:
giffels marked this conversation as resolved.
Show resolved Hide resolved
# The state of a newly created Drone is None, since the plugins need
# to be notified on the first state change. As calling the
# ``set_state`` coroutine is not possible in the constructor, we
# initiate the first state change here
await self.set_state(RequestState())
while True:
current_state = self.state
await current_state.run(self)
Expand Down
3 changes: 1 addition & 2 deletions tardis/resources/poolfactory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
from ..agents.siteagent import SiteAgent
from ..configuration.configuration import Configuration
from ..resources.drone import Drone
from ..resources.dronestates import RequestState

from cobald.composite.weighted import WeightedComposite
from cobald.composite.factory import FactoryPool
Expand Down Expand Up @@ -100,7 +99,7 @@ def create_drone(
plugins: Optional[Iterable[Plugin]] = None,
remote_resource_uuid=None,
drone_uuid=None,
state: State = RequestState(),
state: Optional[State] = None,
created: float = None,
updated: float = None,
):
Expand Down
14 changes: 7 additions & 7 deletions tests/plugins_t/test_sqliteregistry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from tardis.resources.dronestates import BootingState
from tardis.resources.dronestates import IntegrateState
from tardis.resources.dronestates import DownState
from tardis.resources.dronestates import RequestState, DownState
from tardis.interfaces.state import State
from tardis.plugins.sqliteregistry import SqliteRegistry
from tardis.utilities.attributedict import AttributeDict
Expand Down Expand Up @@ -48,15 +48,15 @@ def setUpClass(cls):
"remote_resource_uuid"
],
"drone_uuid": cls.test_resource_attributes["drone_uuid"],
"state": str(BootingState()),
"state": str(RequestState()),
"created": cls.test_resource_attributes["created"],
"updated": cls.test_resource_attributes["updated"],
}

cls.test_notify_result = (
cls.test_resource_attributes["remote_resource_uuid"],
cls.test_resource_attributes["drone_uuid"],
str(BootingState()),
str(RequestState()),
cls.test_resource_attributes["site_name"],
cls.test_resource_attributes["machine_type"],
str(cls.test_resource_attributes["created"]),
Expand Down Expand Up @@ -182,7 +182,7 @@ def test_double_schema_deployment(self):
def test_get_resources(self):
self.registry.add_site(self.test_site_name)
self.registry.add_machine_types(self.test_site_name, self.test_machine_type)
run_async(self.registry.notify, BootingState(), self.test_resource_attributes)
run_async(self.registry.notify, RequestState(), self.test_resource_attributes)

self.assertListEqual(
self.registry.get_resources(
Expand All @@ -208,13 +208,13 @@ def fetch_all():
self.registry.add_site(self.test_site_name)
self.registry.add_machine_types(self.test_site_name, self.test_machine_type)

run_async(self.registry.notify, BootingState(), self.test_resource_attributes)
run_async(self.registry.notify, RequestState(), self.test_resource_attributes)

self.assertEqual([self.test_notify_result], fetch_all())

with self.assertRaises(sqlite3.IntegrityError) as ie:
run_async(
self.registry.notify, BootingState(), self.test_resource_attributes
self.registry.notify, RequestState(), self.test_resource_attributes
)
self.assertTrue("unique" in str(ie.exception).lower())

Expand Down Expand Up @@ -250,7 +250,7 @@ def fetch_all():
self.registry.add_site(site_name)
self.registry.add_machine_types(site_name, self.test_machine_type)

bind_parameters = {"state": "BootingState"}
bind_parameters = {"state": "RequestState"}
bind_parameters.update(self.test_resource_attributes)

run_async(self.registry.insert_resource, bind_parameters)
Expand Down
4 changes: 2 additions & 2 deletions tests/resources_t/test_drone.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from tardis.interfaces.plugin import Plugin
from tardis.interfaces.state import State
from tardis.resources.drone import Drone
from tardis.resources.dronestates import RequestState, DownState
from tardis.resources.dronestates import DownState
from tardis.utilities.attributedict import AttributeDict

from logging import DEBUG
Expand Down Expand Up @@ -140,7 +140,7 @@ def test_set_state(self):

def test_state(self):
self.assertEqual(self.drone.state, self.drone._state)
self.assertIsInstance(self.drone.state, RequestState)
self.assertIsNone(self.drone.state)

def test_notify_plugins(self):
self.drone.register_plugins(self.mock_plugin)
Expand Down
14 changes: 6 additions & 8 deletions tests/resources_t/test_poolfactory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,26 +126,24 @@ def test_create_composite(
@patch("tardis.resources.poolfactory.BatchSystemAgent")
@patch("tardis.resources.poolfactory.SiteAgent")
def test_create_drone(self, mock_site_agent, mock_batch_system_agent, mock_drone):
self.assertEqual(
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is not directly related to the reason for the pull request. Instead it fixes a broken unittest. Actually, the test_create_drone test did not test anything.

create_drone(
site_agent=mock_site_agent, batch_system_agent=mock_batch_system_agent
),
mock_drone(),
create_drone(
site_agent=mock_site_agent, batch_system_agent=mock_batch_system_agent
)

mock_drone.has_call(
self.assertListEqual(
mock_drone.mock_calls,
[
call(
site_agent=mock_site_agent,
batch_system_agent=mock_batch_system_agent,
plugins=None,
remote_resource_uuid=None,
drone_uuid=None,
state=RequestState(),
state=None,
created=None,
updated=None,
)
]
],
)

def test_load_plugins(self):
Expand Down