Implement priority mechanism in new scheduler #8139
+170
−25
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…8015-implement-priority-mechanism # Conflicts: # src/inmanta/agent/agent_new.py # src/inmanta/deploy/scheduler.py # tests/agent_server/deploy/e2e/test_autostarted.py
…echanism # Conflicts: # src/inmanta/agent/agent_new.py
Hugo-Inmanta
reviewed
Oct 3, 2024
| async def test_scheduler_priority(agent: TestAgent, environment, make_resource_minimal): | ||
| """ | ||
| Ensure that the tasks are placed in the queue in the correct order | ||
| And that existing tasks in the queue are replaced if a task that |
There was a problem hiding this comment.
Suggested change
| And that existing tasks in the queue are replaced if a task that | |
| and that existing tasks in the queue are replaced if a task that |
src/inmanta/deploy/work.py
Outdated
| @@ -377,11 +392,12 @@ def extend_blocked_on(resource: ResourceIdStr, new_blockers: set[ResourceIdStr]) | |||
| # discard rather than remove because task may already be running, in which case we leave it run its course | |||
| # and simply add a new one | |||
| task: tasks.Deploy = tasks.Deploy(resource=resource) | |||
| priority: Optional[int] = self.agent_queues.discard(task) | |||
| task_priority: Optional[int] = self.agent_queues.discard(task) | |||
There was a problem hiding this comment.
Should we update the typing as well ? e.g.:
Suggested change
| task_priority: Optional[int] = self.agent_queues.discard(task) | |
| task_priority: Optional[TaskPriority] = self.agent_queues.discard(task) |
And similarly for the method's signature ?
Hugo-Inmanta
approved these changes
Oct 3, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Added priority mechanism to the new scheduler with priorities for every existing task.
closes #8015
Self Check:
Strike through any lines that are not applicable (
~~line~~) then check the box