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.

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

Add HTTP API to scheduler #6270

Merged
merged 17 commits into from
May 17, 2022
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
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
1 change: 1 addition & 0 deletions distributed/distributed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ distributed:
- distributed.http.scheduler.prometheus
- distributed.http.scheduler.info
- distributed.http.scheduler.json
- distributed.http.scheduler.api
- distributed.http.health
- distributed.http.proxy
- distributed.http.statics
Expand Down
57 changes: 57 additions & 0 deletions distributed/http/scheduler/api.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
from __future__ import annotations

import json

from distributed.http.utils import RequestHandler


class APIHandler(RequestHandler):
def get(self):
self.write("API V1")
self.set_header("Content-Type", "text/plain")


class RetireWorkersHandler(RequestHandler):
async def post(self):
fjetter marked this conversation as resolved.
Show resolved Hide resolved
self.set_header("Content-Type", "text/json")
scheduler = self.server
try:
params = json.loads(self.request.body)
workers_info = await scheduler.retire_workers(**params)
self.write(json.dumps(workers_info))
except Exception as e:
Matt711 marked this conversation as resolved.
Show resolved Hide resolved
self.set_status(400, str(e))
self.write(json.dumps({"Error": "Bad request"}))


class GetWorkersHandler(RequestHandler):
def get(self):
self.set_header("Content-Type", "text/json")
scheduler = self.server
response = {
"num_workers": len(scheduler.workers),
"workers": [
{"name": ws.name, "address": ws.address}
for ws in scheduler.workers.values()
],
}
self.write(json.dumps(response))


class AdaptiveTargetHandler(RequestHandler):
def get(self):
self.set_header("Content-Type", "text/json")
scheduler = self.server
desired_workers = scheduler.adaptive_target()
response = {
"workers": desired_workers,
}
self.write(json.dumps(response))


routes: list[tuple] = [
("/api/v1", APIHandler, {}),
("/api/v1/retire_workers", RetireWorkersHandler, {}),
("/api/v1/get_workers", GetWorkersHandler, {}),
("/api/v1/adaptive_target", AdaptiveTargetHandler, {}),
]
51 changes: 51 additions & 0 deletions distributed/http/scheduler/tests/test_scheduler_http.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import json
import re

import aiohttp
import pytest

pytest.importorskip("bokeh")
Expand Down Expand Up @@ -245,3 +246,53 @@ async def test_eventstream(c, s, a, b):
)
assert "websocket" in str(s.plugins).lower()
ws_client.close()


@gen_cluster(client=True, clean_kwargs={"threads": False})
async def test_api(c, s, a, b):
async with aiohttp.ClientSession() as session:
async with session.get(
"http://localhost:%d/api/v1" % s.http_server.port
) as resp:
assert resp.status == 200
assert resp.headers["Content-Type"] == "text/plain"
assert (await resp.text()) == "API V1"


@gen_cluster(client=True, clean_kwargs={"threads": False})
async def test_retire_workers(c, s, a, b):
async with aiohttp.ClientSession() as session:
params = {"workers": [a.address, b.address]}
async with session.post(
"http://localhost:%d/api/v1/retire_workers" % s.http_server.port,
json=params,
) as resp:
assert resp.status == 200
jacobtomlinson marked this conversation as resolved.
Show resolved Hide resolved
assert resp.headers["Content-Type"] == "text/json"
retired_workers_info = json.loads(await resp.text())
assert len(retired_workers_info) == 2


@gen_cluster(client=True, clean_kwargs={"threads": False})
async def test_get_workers(c, s, a, b):
async with aiohttp.ClientSession() as session:
async with session.get(
"http://localhost:%d/api/v1/get_workers" % s.http_server.port
) as resp:
assert resp.status == 200
Matt711 marked this conversation as resolved.
Show resolved Hide resolved
assert resp.headers["Content-Type"] == "text/json"
workers_info = json.loads(await resp.text())["workers"]
workers_address = [worker.get("address") for worker in workers_info]
assert set(workers_address) == {a.address, b.address}


@gen_cluster(client=True, clean_kwargs={"threads": False})
async def test_adaptive_target(c, s, a, b):
async with aiohttp.ClientSession() as session:
async with session.get(
"http://localhost:%d/api/v1/adaptive_target" % s.http_server.port
) as resp:
assert resp.status == 200
Matt711 marked this conversation as resolved.
Show resolved Hide resolved
assert resp.headers["Content-Type"] == "text/json"
num_workers = json.loads(await resp.text())["workers"]
assert num_workers == 0
3 changes: 3 additions & 0 deletions docs/source/http_services.rst
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ Pages and JSON endpoints served by the scheduler
- ``/sitemap.json``: list of available endpoints
- ``/statics/()``: static file content (CSS, etc)
- ``/stealing``: worker occupancy metrics, to evaluate task stealing
- ``/api/v1/retire_workers`` : retire certain workers on the scheduler
Copy link
Member

Choose a reason for hiding this comment

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

It would be nice if this mentioned specifically that addresses are expected and not names. Sometimes they can be interchangable but this API expects addresses. The example below might still be misleading since we're setting names, by default, to the addresses.

- ``/api/v1/get_workers`` : get all workers on the scheduler
- ``/api/v1/adaptive_target`` : get the target number of workers based on the scheduler's load

Individual bokeh plots
----------------------
Expand Down