daemon: sched/ — the concurrency governor + schedule-window evaluation (build step 4)
The scheduling brain, built against CORE's headers (vdm/engine.hpp,
vdm/segment/budget.hpp) — signatures only; the Engine bodies land in
CORE stage 8 and the Scheduler that wires governor <-> store <-> engine
<-> timer comes after that (daemon/docs/deferrals.md D4).
- sched/governor — a pure decision function. In: a snapshot of every
task's coarse RunState and every queue's state (schedule windows
pre-resolved). Out: {to_start, to_resume, to_pause, pause_reasons,
priority_order}. Enforces, all in TASK units per ADR 0011 §1:
connection.maxConcurrentDownloads; the min(that, maxActiveSegments)
clamp (§2); Queue.maxConcurrent; the per-host task cap (§4); and a
stopped queue / closed window runs nothing. Never touches a task
paused for `user` or CORE's `auto` (ADR 0013 §3) — only Schedule /
QueueStopped / AdmissionReconcile are auto-resumable. Deterministic:
main-list before queued-in-queue, then queue order, then FIFO, then
task_id.
- sched/schedule_window — window_open(Schedule, local tm): disabled =>
always open; `once` => date + time match; `periodic` => weekday in
daysOfWeek (empty = every day) + time in [start, stop); null start =>
midnight, null stop => end of day, stop < start => overnight window.
Pure; re-evaluated every tick, no cached instants.
- veloxd_sched static lib; veloxd links it (nothing calls it yet).
Tests (ASan+UBSan and TSan clean): veloxd.sched_window (10 window
cases incl. overnight, once, null bounds), veloxd.sched_governor
(global/clamp/per-queue/per-host caps, stop vs window pause reasons,
resume-only-governor-reasons, auth-pause untouched, admission
reconcile, determinism under shuffled input). 32 daemon/cli tests
green; full tree green.
Co-Authored-By: Claude Sonnet 5 <[email protected]>
Claude-Session: https://claude.ai/code/session_01Upd9WhG9oppieig5nRDLig
This commit is contained in:
Claude Sonnet 5
@@ -16,3 +16,5 @@ veloxd_test(store_migrations LIBS veloxd_store)
|
||||
veloxd_test(pairings LIBS veloxd_store veloxd_rpc)
|
||||
veloxd_test(ws_frame LIBS veloxd_rpc)
|
||||
veloxd_test(ws_server LIBS veloxd_rpc)
|
||||
veloxd_test(sched_window LIBS veloxd_sched)
|
||||
veloxd_test(sched_governor LIBS veloxd_sched)
|
||||
|
||||
@@ -0,0 +1,178 @@
|
||||
#include "sched/governor.hpp"
|
||||
|
||||
#include <algorithm>
|
||||
#include <string>
|
||||
|
||||
#include "check.hpp"
|
||||
|
||||
using namespace velox::daemon::sched;
|
||||
|
||||
namespace {
|
||||
|
||||
bool has(const std::vector<std::string>& v, const std::string& x) {
|
||||
return std::find(v.begin(), v.end(), x) != v.end();
|
||||
}
|
||||
|
||||
TaskView task(std::string id, RunState st, std::optional<std::string> queue = std::nullopt,
|
||||
std::int64_t pos = 0, std::string host = "", std::int64_t rank = 0) {
|
||||
TaskView t;
|
||||
t.task_id = std::move(id);
|
||||
t.run_state = st;
|
||||
t.queue_id = std::move(queue);
|
||||
t.queue_position = pos;
|
||||
t.host = std::move(host);
|
||||
t.admit_rank = rank;
|
||||
return t;
|
||||
}
|
||||
|
||||
QueueView queue(std::string id, bool running, std::int64_t cap, bool window = true) {
|
||||
QueueView q;
|
||||
q.queue_id = std::move(id);
|
||||
q.running = running;
|
||||
q.max_concurrent = cap;
|
||||
q.window_open = window;
|
||||
return q;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
void run() {
|
||||
// --- global cap: 5 queued, max 3 -> start 3, order is all 3 --------------------
|
||||
{
|
||||
Governor g(GovernorConfig{.max_concurrent_downloads = 3, .max_active_segments = 32});
|
||||
std::vector<TaskView> t;
|
||||
for (int i = 0; i < 5; ++i)
|
||||
t.push_back(task("t" + std::to_string(i), RunState::Queued, std::nullopt, 0, "", i));
|
||||
const auto d = g.evaluate(t, {});
|
||||
CHECK_EQ(d.to_start.size(), 3u);
|
||||
CHECK(has(d.to_start, "t0") && has(d.to_start, "t1") && has(d.to_start, "t2"));
|
||||
CHECK_EQ(d.priority_order.size(), 3u);
|
||||
CHECK_EQ(d.priority_order.front(), std::string("t0")); // FIFO by admit_rank
|
||||
CHECK(d.to_pause.empty());
|
||||
}
|
||||
|
||||
// --- the ADR 0011 §2 clamp: maxActiveSegments below maxConcurrentDownloads ------
|
||||
{
|
||||
Governor g(GovernorConfig{.max_concurrent_downloads = 10, .max_active_segments = 2});
|
||||
std::vector<TaskView> t;
|
||||
for (int i = 0; i < 6; ++i) t.push_back(task("t" + std::to_string(i), RunState::Queued));
|
||||
const auto d = g.evaluate(t, {});
|
||||
CHECK_EQ(d.to_start.size(), 2u); // clamped to the segment budget
|
||||
}
|
||||
|
||||
// --- per-queue cap: queue running, cap 2, 4 queued in it -----------------------
|
||||
{
|
||||
Governor g(GovernorConfig{.max_concurrent_downloads = 10, .max_active_segments = 32});
|
||||
std::vector<TaskView> t;
|
||||
for (int i = 0; i < 4; ++i)
|
||||
t.push_back(task("q" + std::to_string(i), RunState::Queued, "Q", i));
|
||||
const auto d = g.evaluate(t, {queue("Q", true, 2)});
|
||||
CHECK_EQ(d.to_start.size(), 2u);
|
||||
CHECK(has(d.to_start, "q0") && has(d.to_start, "q1")); // lowest queue_position first
|
||||
}
|
||||
|
||||
// --- a stopped queue: its running tasks are paused (QueueStopped) -------------
|
||||
{
|
||||
Governor g(GovernorConfig{.max_concurrent_downloads = 10, .max_active_segments = 32});
|
||||
std::vector<TaskView> t{
|
||||
task("r0", RunState::Running, "Q", 0),
|
||||
task("r1", RunState::Running, "Q", 1),
|
||||
task("m0", RunState::Running, std::nullopt, 0, "", 5), // main list, unaffected
|
||||
};
|
||||
const auto d = g.evaluate(t, {queue("Q", /*running=*/false, 4)});
|
||||
CHECK_EQ(d.to_pause.size(), 2u);
|
||||
CHECK(has(d.to_pause, "r0") && has(d.to_pause, "r1"));
|
||||
CHECK(d.pause_reasons.at("r0") == PauseReason::QueueStopped);
|
||||
CHECK(!has(d.to_pause, "m0"));
|
||||
}
|
||||
|
||||
// --- schedule window closed: pause reason is Schedule, not QueueStopped -------
|
||||
{
|
||||
Governor g(GovernorConfig{.max_concurrent_downloads = 10, .max_active_segments = 32});
|
||||
std::vector<TaskView> t{task("r0", RunState::Running, "Q", 0)};
|
||||
const auto d = g.evaluate(t, {queue("Q", /*running=*/true, 4, /*window=*/false)});
|
||||
CHECK_EQ(d.to_pause.size(), 1u);
|
||||
CHECK(d.pause_reasons.at("r0") == PauseReason::Schedule);
|
||||
}
|
||||
|
||||
// --- resume: a task paused for Schedule comes back when the window reopens ----
|
||||
{
|
||||
Governor g(GovernorConfig{.max_concurrent_downloads = 10, .max_active_segments = 32});
|
||||
TaskView p = task("p0", RunState::Paused, "Q", 0);
|
||||
p.pause_reason = PauseReason::Schedule;
|
||||
TaskView u = task("u0", RunState::Paused, "Q", 1);
|
||||
u.pause_reason = PauseReason::User; // must NOT be auto-resumed
|
||||
const auto d = g.evaluate({p, u}, {queue("Q", true, 4, true)});
|
||||
CHECK_EQ(d.to_resume.size(), 1u);
|
||||
CHECK(has(d.to_resume, "p0"));
|
||||
CHECK(!has(d.to_resume, "u0"));
|
||||
}
|
||||
|
||||
// --- an Auto (auth) pause is never touched, even with slots free -------------
|
||||
{
|
||||
Governor g(GovernorConfig{.max_concurrent_downloads = 10, .max_active_segments = 32});
|
||||
TaskView a = task("a0", RunState::Paused, std::nullopt);
|
||||
a.pause_reason = PauseReason::Auto;
|
||||
const auto d = g.evaluate({a}, {});
|
||||
CHECK(d.to_resume.empty());
|
||||
CHECK(d.to_pause.empty());
|
||||
}
|
||||
|
||||
// --- per-host cap: 3 queued on the same host, cap 1 ------------------------
|
||||
{
|
||||
GovernorConfig cfg{.max_concurrent_downloads = 10, .max_active_segments = 32};
|
||||
cfg.host_caps["cdn.example"] = 1;
|
||||
Governor g(cfg);
|
||||
std::vector<TaskView> t{
|
||||
task("h0", RunState::Queued, std::nullopt, 0, "cdn.example", 0),
|
||||
task("h1", RunState::Queued, std::nullopt, 0, "cdn.example", 1),
|
||||
task("h2", RunState::Queued, std::nullopt, 0, "other.example", 2),
|
||||
};
|
||||
const auto d = g.evaluate(t, {});
|
||||
CHECK_EQ(d.to_start.size(), 2u); // one per host
|
||||
CHECK(has(d.to_start, "h0") && has(d.to_start, "h2"));
|
||||
CHECK(!has(d.to_start, "h1"));
|
||||
}
|
||||
|
||||
// --- admission reconcile: 4 running, cap drops to 2 -> pause the 2 lowest -----
|
||||
{
|
||||
Governor g(GovernorConfig{.max_concurrent_downloads = 2, .max_active_segments = 32});
|
||||
std::vector<TaskView> t;
|
||||
for (int i = 0; i < 4; ++i)
|
||||
t.push_back(task("t" + std::to_string(i), RunState::Running, std::nullopt, 0, "", i));
|
||||
const auto d = g.evaluate(t, {});
|
||||
CHECK_EQ(d.to_pause.size(), 2u);
|
||||
CHECK(has(d.to_pause, "t2") && has(d.to_pause, "t3")); // lowest priority (highest rank)
|
||||
CHECK(d.pause_reasons.at("t2") == PauseReason::AdmissionReconcile);
|
||||
CHECK_EQ(d.priority_order.size(), 2u);
|
||||
}
|
||||
|
||||
// --- determinism: shuffled input, identical Decision -----------------------
|
||||
{
|
||||
Governor g(GovernorConfig{.max_concurrent_downloads = 2, .max_active_segments = 32});
|
||||
std::vector<TaskView> a{
|
||||
task("b", RunState::Queued, std::nullopt, 0, "", 1),
|
||||
task("a", RunState::Queued, std::nullopt, 0, "", 0),
|
||||
task("c", RunState::Queued, std::nullopt, 0, "", 2),
|
||||
};
|
||||
std::vector<TaskView> b{a[2], a[0], a[1]};
|
||||
const auto da = g.evaluate(a, {});
|
||||
const auto db = g.evaluate(b, {});
|
||||
CHECK(da.to_start == db.to_start);
|
||||
CHECK(da.priority_order == db.priority_order);
|
||||
CHECK_EQ(da.priority_order.front(), std::string("a"));
|
||||
}
|
||||
|
||||
// --- main list outranks queues in priority_order -------------------------
|
||||
{
|
||||
Governor g(GovernorConfig{.max_concurrent_downloads = 10, .max_active_segments = 32});
|
||||
std::vector<TaskView> t{
|
||||
task("qtask", RunState::Running, "Q", 0),
|
||||
task("mtask", RunState::Running, std::nullopt, 0, "", 99),
|
||||
};
|
||||
const auto d = g.evaluate(t, {queue("Q", true, 4)});
|
||||
CHECK_EQ(d.priority_order.front(), std::string("mtask"));
|
||||
}
|
||||
}
|
||||
|
||||
TEST_MAIN()
|
||||
@@ -0,0 +1,120 @@
|
||||
#include "sched/schedule_window.hpp"
|
||||
|
||||
#include <cstring>
|
||||
#include <ctime>
|
||||
|
||||
#include "check.hpp"
|
||||
|
||||
namespace proto = velox::proto;
|
||||
using velox::daemon::sched::window_open;
|
||||
|
||||
namespace {
|
||||
|
||||
// A std::tm for a given weekday (0=Sun) and HH:MM on 2026-09-14 (a Monday) + offset days.
|
||||
std::tm at(int wday, int hh, int mm, const char* date = "2026-09-14") {
|
||||
std::tm t{};
|
||||
t.tm_year = 126; // 2026
|
||||
// parse "YYYY-MM-DD"
|
||||
int y = 0, mo = 0, d = 0;
|
||||
std::sscanf(date, "%d-%d-%d", &y, &mo, &d);
|
||||
t.tm_year = y - 1900;
|
||||
t.tm_mon = mo - 1;
|
||||
t.tm_mday = d;
|
||||
t.tm_wday = wday;
|
||||
t.tm_hour = hh;
|
||||
t.tm_min = mm;
|
||||
return t;
|
||||
}
|
||||
|
||||
proto::Schedule periodic(const char* start, const char* stop, std::vector<std::int64_t> days) {
|
||||
proto::Schedule s;
|
||||
s.enabled = true;
|
||||
s.mode = proto::ScheduleMode::Periodic;
|
||||
if (start) s.startTime = start;
|
||||
if (stop) s.stopTime = stop;
|
||||
if (!days.empty()) s.daysOfWeek = std::move(days);
|
||||
return s;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
void run() {
|
||||
// --- disabled schedule: always open --------------------------------------------
|
||||
{
|
||||
proto::Schedule s;
|
||||
s.enabled = false;
|
||||
s.mode = proto::ScheduleMode::Periodic;
|
||||
CHECK(window_open(s, at(3, 3, 0)));
|
||||
std::optional<proto::Schedule> none;
|
||||
CHECK(window_open(none, at(3, 3, 0)));
|
||||
}
|
||||
|
||||
// --- periodic, weekdays 01:00-06:00 -------------------------------------------
|
||||
{
|
||||
const auto s = periodic("01:00", "06:00", {1, 2, 3, 4, 5}); // Mon-Fri
|
||||
CHECK(window_open(s, at(1, 2, 30))); // Monday 02:30 -> open
|
||||
CHECK(!window_open(s, at(1, 6, 0))); // 06:00 is the exclusive end
|
||||
CHECK(!window_open(s, at(1, 0, 59))); // before start
|
||||
CHECK(!window_open(s, at(0, 2, 30))); // Sunday -> wrong day
|
||||
CHECK(!window_open(s, at(6, 2, 30))); // Saturday -> wrong day
|
||||
}
|
||||
|
||||
// --- periodic, no daysOfWeek -> every day ------------------------------------
|
||||
{
|
||||
const auto s = periodic("09:00", "17:00", {});
|
||||
CHECK(window_open(s, at(0, 12, 0))); // Sunday still fine
|
||||
CHECK(window_open(s, at(3, 9, 0))); // inclusive start
|
||||
CHECK(!window_open(s, at(3, 17, 0)));
|
||||
}
|
||||
|
||||
// --- overnight window 22:00-06:00 ------------------------------------------
|
||||
{
|
||||
const auto s = periodic("22:00", "06:00", {});
|
||||
CHECK(window_open(s, at(3, 23, 0))); // late evening
|
||||
CHECK(window_open(s, at(3, 2, 0))); // early morning
|
||||
CHECK(!window_open(s, at(3, 12, 0))); // midday -> closed
|
||||
CHECK(window_open(s, at(3, 22, 0))); // inclusive start
|
||||
CHECK(!window_open(s, at(3, 6, 0))); // exclusive end
|
||||
}
|
||||
|
||||
// --- null stopTime -> until end of day ----------------------------------
|
||||
{
|
||||
auto s = periodic("20:00", nullptr, {});
|
||||
CHECK(!window_open(s, at(3, 19, 59)));
|
||||
CHECK(window_open(s, at(3, 20, 0)));
|
||||
CHECK(window_open(s, at(3, 23, 59)));
|
||||
}
|
||||
|
||||
// --- null startTime -> from midnight -----------------------------------
|
||||
{
|
||||
auto s = periodic(nullptr, "08:00", {});
|
||||
CHECK(window_open(s, at(3, 0, 0)));
|
||||
CHECK(window_open(s, at(3, 7, 59)));
|
||||
CHECK(!window_open(s, at(3, 8, 0)));
|
||||
}
|
||||
|
||||
// --- mode "once": only on the named date ------------------------------
|
||||
{
|
||||
proto::Schedule s;
|
||||
s.enabled = true;
|
||||
s.mode = proto::ScheduleMode::Once;
|
||||
s.startTime = "10:00";
|
||||
s.stopTime = "12:00";
|
||||
s.onceDate = "2026-09-14";
|
||||
CHECK(window_open(s, at(1, 11, 0, "2026-09-14"))); // right date + time
|
||||
CHECK(!window_open(s, at(1, 9, 0, "2026-09-14"))); // right date, before window
|
||||
CHECK(!window_open(s, at(2, 11, 0, "2026-09-15"))); // wrong date
|
||||
s.daysOfWeek = {2}; // ignored for "once"
|
||||
CHECK(window_open(s, at(1, 11, 0, "2026-09-14")));
|
||||
}
|
||||
|
||||
// --- "once" with no onceDate never runs ------------------------------
|
||||
{
|
||||
proto::Schedule s;
|
||||
s.enabled = true;
|
||||
s.mode = proto::ScheduleMode::Once;
|
||||
CHECK(!window_open(s, at(1, 11, 0)));
|
||||
}
|
||||
}
|
||||
|
||||
TEST_MAIN()
|
||||
Reference in New Issue
Block a user