-
Notifications
You must be signed in to change notification settings - Fork 425
Add an Admin API endpoint to fetch scheduled tasks #18214
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.
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
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
741e8de
add admin api endpoint for fetching scheduled tasks
H-Shay c0efe29
test
H-Shay 69fff5d
docs
H-Shay f14ff31
newsfragment
H-Shay eab4464
Merge branch 'develop' into shay/tasks_api
anoadragon453 124c94c
requested changes
H-Shay File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Add an Admin API endpoint `GET /_synapse/admin/v1/scheduled_tasks` to fetch scheduled tasks. |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| # Show scheduled tasks | ||
|
|
||
| This API returns information about scheduled tasks. | ||
|
|
||
| To use it, you will need to authenticate by providing an `access_token` | ||
| for a server admin: see [Admin API](../usage/administration/admin_api/). | ||
|
|
||
| The api is: | ||
| ``` | ||
| GET /_synapse/admin/v1/scheduled_tasks | ||
| ``` | ||
|
|
||
| It returns a JSON body like the following: | ||
|
|
||
| ```json | ||
| { | ||
| "scheduled_tasks": [ | ||
| { | ||
| "id": "GSA124oegf1", | ||
| "action": "shutdown_room", | ||
| "status": "complete", | ||
| "timestamp": 23423523, | ||
| "resource_id": "!roomid", | ||
| "result": "some result", | ||
| "error": null | ||
| } | ||
| ] | ||
| } | ||
| ``` | ||
|
|
||
| **Query parameters:** | ||
|
|
||
| * `action_name`: string - Is optional. Returns only the scheduled tasks with the given action name. | ||
| * `resource_id`: string - Is optional. Returns only the scheduled tasks with the given resource id. | ||
| * `status`: string - Is optional. Returns only the scheduled tasks matching the given status, one of | ||
| - "scheduled" - Task is scheduled but not active | ||
| - "active" - Task is active and probably running, and if not will be run on next scheduler loop run | ||
| - "complete" - Task has completed successfully | ||
| - "failed" - Task is over and either returned a failed status, or had an exception | ||
|
|
||
| * `max_timestamp`: int - Is optional. Returns only the scheduled tasks with a timestamp inferior to the specified one. | ||
|
|
||
| **Response** | ||
|
|
||
| The following fields are returned in the JSON response body along with a `200` HTTP status code: | ||
|
|
||
| * `id`: string - ID of scheduled task. | ||
| * `action`: string - The name of the scheduled task's action. | ||
| * `status`: string - The status of the scheduled task. | ||
| * `timestamp_ms`: integer - The timestamp (in milliseconds since the unix epoch) of the given task - If the status is "scheduled" then this represents when it should be launched. | ||
| Otherwise it represents the last time this task got a change of state. | ||
| * `resource_id`: Optional string - The resource id of the scheduled task, if it possesses one | ||
| * `result`: Optional Json - Any result of the scheduled task, if given | ||
| * `error`: Optional string - If the task has the status "failed", the error associated with this failure | ||
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| # | ||
| # This file is licensed under the Affero General Public License (AGPL) version 3. | ||
| # | ||
| # Copyright (C) 2025 New Vector, Ltd | ||
| # | ||
| # This program is free software: you can redistribute it and/or modify | ||
| # it under the terms of the GNU Affero General Public License as | ||
| # published by the Free Software Foundation, either version 3 of the | ||
| # License, or (at your option) any later version. | ||
| # | ||
| # See the GNU Affero General Public License for more details: | ||
| # <https://www.gnu.org/licenses/agpl-3.0.html>. | ||
| # | ||
| # | ||
| # | ||
| from typing import TYPE_CHECKING, Tuple | ||
|
|
||
| from synapse.http.servlet import RestServlet, parse_integer, parse_string | ||
| from synapse.http.site import SynapseRequest | ||
| from synapse.rest.admin import admin_patterns, assert_requester_is_admin | ||
| from synapse.types import JsonDict, TaskStatus | ||
|
|
||
| if TYPE_CHECKING: | ||
| from synapse.server import HomeServer | ||
|
|
||
|
|
||
| class ScheduledTasksRestServlet(RestServlet): | ||
| """Get a list of scheduled tasks and their statuses | ||
| optionally filtered by action name, resource id, status, and max timestamp | ||
| """ | ||
|
|
||
| PATTERNS = admin_patterns("/scheduled_tasks$") | ||
|
|
||
| def __init__(self, hs: "HomeServer"): | ||
| self._auth = hs.get_auth() | ||
| self._store = hs.get_datastores().main | ||
|
|
||
| async def on_GET(self, request: SynapseRequest) -> Tuple[int, JsonDict]: | ||
| await assert_requester_is_admin(self._auth, request) | ||
|
|
||
| # extract query params | ||
| action_name = parse_string(request, "action_name") | ||
| resource_id = parse_string(request, "resource_id") | ||
| status = parse_string(request, "job_status") | ||
| max_timestamp = parse_integer(request, "max_timestamp") | ||
|
|
||
| actions = [action_name] if action_name else None | ||
| statuses = [TaskStatus(status)] if status else None | ||
|
|
||
| tasks = await self._store.get_scheduled_tasks( | ||
| actions=actions, | ||
| resource_id=resource_id, | ||
| statuses=statuses, | ||
| max_timestamp=max_timestamp, | ||
| ) | ||
|
|
||
| json_tasks = [] | ||
| for task in tasks: | ||
| result_task = { | ||
| "id": task.id, | ||
| "action": task.action, | ||
| "status": task.status, | ||
| "timestamp_ms": task.timestamp, | ||
| "resource_id": task.resource_id, | ||
| "result": task.result, | ||
| "error": task.error, | ||
| } | ||
| json_tasks.append(result_task) | ||
|
|
||
| return 200, {"scheduled_tasks": json_tasks} |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,192 @@ | ||
| # | ||
| # This file is licensed under the Affero General Public License (AGPL) version 3. | ||
| # | ||
| # Copyright (C) 2025 New Vector, Ltd | ||
| # | ||
| # This program is free software: you can redistribute it and/or modify | ||
| # it under the terms of the GNU Affero General Public License as | ||
| # published by the Free Software Foundation, either version 3 of the | ||
| # License, or (at your option) any later version. | ||
| # | ||
| # See the GNU Affero General Public License for more details: | ||
| # <https://www.gnu.org/licenses/agpl-3.0.html>. | ||
| # | ||
| # | ||
| # | ||
| from typing import Mapping, Optional, Tuple | ||
|
|
||
| from twisted.test.proto_helpers import MemoryReactor | ||
|
|
||
| import synapse.rest.admin | ||
| from synapse.api.errors import Codes | ||
| from synapse.rest.client import login | ||
| from synapse.server import HomeServer | ||
| from synapse.types import JsonMapping, ScheduledTask, TaskStatus | ||
| from synapse.util import Clock | ||
|
|
||
| from tests import unittest | ||
|
|
||
|
|
||
| class ScheduledTasksAdminApiTestCase(unittest.HomeserverTestCase): | ||
| servlets = [ | ||
| synapse.rest.admin.register_servlets, | ||
| login.register_servlets, | ||
| ] | ||
|
|
||
| def prepare(self, reactor: MemoryReactor, clock: Clock, hs: HomeServer) -> None: | ||
| self.store = hs.get_datastores().main | ||
| self.admin_user = self.register_user("admin", "pass", admin=True) | ||
| self.admin_user_tok = self.login("admin", "pass") | ||
| self._task_scheduler = hs.get_task_scheduler() | ||
|
|
||
| # create and schedule a few tasks | ||
| async def _test_task( | ||
| task: ScheduledTask, | ||
| ) -> Tuple[TaskStatus, Optional[JsonMapping], Optional[str]]: | ||
| return TaskStatus.ACTIVE, None, None | ||
|
|
||
| async def _finished_test_task( | ||
| task: ScheduledTask, | ||
| ) -> Tuple[TaskStatus, Optional[JsonMapping], Optional[str]]: | ||
| return TaskStatus.COMPLETE, None, None | ||
|
|
||
| async def _failed_test_task( | ||
| task: ScheduledTask, | ||
| ) -> Tuple[TaskStatus, Optional[JsonMapping], Optional[str]]: | ||
| return TaskStatus.FAILED, None, "Everything failed" | ||
|
|
||
| self._task_scheduler.register_action(_test_task, "test_task") | ||
| self.get_success( | ||
| self._task_scheduler.schedule_task("test_task", resource_id="test") | ||
| ) | ||
|
|
||
| self._task_scheduler.register_action(_finished_test_task, "finished_test_task") | ||
| self.get_success( | ||
| self._task_scheduler.schedule_task( | ||
| "finished_test_task", resource_id="finished_task" | ||
| ) | ||
| ) | ||
|
|
||
| self._task_scheduler.register_action(_failed_test_task, "failed_test_task") | ||
| self.get_success( | ||
| self._task_scheduler.schedule_task( | ||
| "failed_test_task", resource_id="failed_task" | ||
| ) | ||
| ) | ||
|
|
||
| def check_scheduled_tasks_response(self, scheduled_tasks: Mapping) -> list: | ||
| result = [] | ||
| for task in scheduled_tasks: | ||
| if task["resource_id"] == "test": | ||
| self.assertEqual(task["status"], TaskStatus.ACTIVE) | ||
| self.assertEqual(task["action"], "test_task") | ||
| result.append(task) | ||
| if task["resource_id"] == "finished_task": | ||
| self.assertEqual(task["status"], TaskStatus.COMPLETE) | ||
| self.assertEqual(task["action"], "finished_test_task") | ||
| result.append(task) | ||
| if task["resource_id"] == "failed_task": | ||
| self.assertEqual(task["status"], TaskStatus.FAILED) | ||
| self.assertEqual(task["action"], "failed_test_task") | ||
| result.append(task) | ||
|
|
||
| return result | ||
|
|
||
| def test_requester_is_not_admin(self) -> None: | ||
| """ | ||
| If the user is not a server admin, an error 403 is returned. | ||
| """ | ||
|
|
||
| self.register_user("user", "pass", admin=False) | ||
| other_user_tok = self.login("user", "pass") | ||
|
|
||
| channel = self.make_request( | ||
| "GET", | ||
| "/_synapse/admin/v1/scheduled_tasks", | ||
| content={}, | ||
| access_token=other_user_tok, | ||
| ) | ||
|
|
||
| self.assertEqual(403, channel.code, msg=channel.json_body) | ||
| self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"]) | ||
|
|
||
| def test_scheduled_tasks(self) -> None: | ||
| """ | ||
| Test that endpoint returns scheduled tasks. | ||
| """ | ||
|
|
||
| channel = self.make_request( | ||
| "GET", | ||
| "/_synapse/admin/v1/scheduled_tasks", | ||
| content={}, | ||
| access_token=self.admin_user_tok, | ||
| ) | ||
| self.assertEqual(200, channel.code, msg=channel.json_body) | ||
| scheduled_tasks = channel.json_body["scheduled_tasks"] | ||
|
|
||
| # make sure we got back all the scheduled tasks | ||
| found_tasks = self.check_scheduled_tasks_response(scheduled_tasks) | ||
| self.assertEqual(len(found_tasks), 3) | ||
|
|
||
| def test_filtering_scheduled_tasks(self) -> None: | ||
| """ | ||
| Test that filtering the scheduled tasks response via query params works as expected. | ||
| """ | ||
| # filter via job_status | ||
| channel = self.make_request( | ||
| "GET", | ||
| "/_synapse/admin/v1/scheduled_tasks?job_status=active", | ||
| content={}, | ||
| access_token=self.admin_user_tok, | ||
| ) | ||
| self.assertEqual(200, channel.code, msg=channel.json_body) | ||
| scheduled_tasks = channel.json_body["scheduled_tasks"] | ||
| found_tasks = self.check_scheduled_tasks_response(scheduled_tasks) | ||
|
|
||
| # only the active task should have been returned | ||
| self.assertEqual(len(found_tasks), 1) | ||
| self.assertEqual(found_tasks[0]["status"], "active") | ||
|
|
||
| # filter via action_name | ||
| channel = self.make_request( | ||
| "GET", | ||
| "/_synapse/admin/v1/scheduled_tasks?action_name=test_task", | ||
| content={}, | ||
| access_token=self.admin_user_tok, | ||
| ) | ||
| self.assertEqual(200, channel.code, msg=channel.json_body) | ||
| scheduled_tasks = channel.json_body["scheduled_tasks"] | ||
|
|
||
| # only test_task should have been returned | ||
| found_tasks = self.check_scheduled_tasks_response(scheduled_tasks) | ||
| self.assertEqual(len(found_tasks), 1) | ||
| self.assertEqual(found_tasks[0]["action"], "test_task") | ||
|
|
||
| # filter via max_timestamp | ||
| channel = self.make_request( | ||
| "GET", | ||
| "/_synapse/admin/v1/scheduled_tasks?max_timestamp=0", | ||
| content={}, | ||
| access_token=self.admin_user_tok, | ||
| ) | ||
| self.assertEqual(200, channel.code, msg=channel.json_body) | ||
| scheduled_tasks = channel.json_body["scheduled_tasks"] | ||
| found_tasks = self.check_scheduled_tasks_response(scheduled_tasks) | ||
|
|
||
| # none should have been returned | ||
| self.assertEqual(len(found_tasks), 0) | ||
|
|
||
| # filter via resource id | ||
| channel = self.make_request( | ||
| "GET", | ||
| "/_synapse/admin/v1/scheduled_tasks?resource_id=failed_task", | ||
| content={}, | ||
| access_token=self.admin_user_tok, | ||
| ) | ||
| self.assertEqual(200, channel.code, msg=channel.json_body) | ||
| scheduled_tasks = channel.json_body["scheduled_tasks"] | ||
| found_tasks = self.check_scheduled_tasks_response(scheduled_tasks) | ||
|
|
||
| # only the task with the matching resource id should have been returned | ||
| self.assertEqual(len(found_tasks), 1) | ||
| self.assertEqual(found_tasks[0]["resource_id"], "failed_task") |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.