Files
vdm/daemon/src/sched/scheduler.cpp
T
samiandClaude Sonnet 5 a967eca669 daemon: persist engine progress/probe to the store — segments:0 no longer leaks
Engine numbers never reached the store: download.get after a correctly-finished
download reported sizeBytes: null, downloadedBytes: 0, speedBps: 0, resumable:
false, segments: 0, segmentDetail: [] — segments: 0 breaks the frozen contract
(TaskSummary.segments is minimum:1, required).

- Scheduler::tick() now probes (EnginePort::probe) before every start(), persisting
  sizeBytes/resumable/validators via Tasks::set_probe_result before a byte moves,
  then starts the engine with that ProbeResult as probe_hint.
- Scheduler::persist_progress() (new) writes downloadedBytes/speedBps/segments/
  segmentDetail from the engine's Progress. Called from progress_snapshot() (the
  250ms tick) *and* once more from on_engine_state right before release()/unmap on
  every terminal transition, so a task that finishes between two ticks — the common
  case for anything small or fast — still leaves real numbers instead of the
  pre-persistence defaults.
- TaskSummary.segments is sourced from segments.size() when the task has any
  (matching what actually lands in segmentDetail, per the schema's "exactly
  segments entries"), falling back to the engine's effective_segments (budget
  slots *held*, not necessarily physical range count) only pre-segmentation.
- Tasks::set_final_bytes tops up on_finished's byte count as a last-resort
  backstop.
- store/segments.{cpp,hpp}: read/write access to the segments table behind
  TaskDetail.segmentDetail. Wired into daemon/CMakeLists.txt.
- migrations/0002: speed_bps on tasks and segments; fixes segments.state's CHECK
  to include 'pending' (0001 omitted it, so a pre-connect snapshot could never be
  written).
- store_migrations_test's forward-only loop faked "released version N" by setting
  the user_version pragma alone, with no real schema underneath — never exercised
  until 0002 existed. Fixed to actually build the db through migrations 1..N first.

Verified against real veloxd + tools/testserver (not just unit tests):
download.list/download.get correct immediately after completion and after a
daemon restart, with saveTo.allowedRoots pointed at an isolated dir.

Observed but not fixed (CORE, not this lane, noted in deferrals.md): Progress.
speed_bps reads back 0 for the whole lifetime of a live throttled download in the
same E2E check, despite downloadedBytes visibly advancing. DAEMON passes it
through unmodified; filed rather than worked around.

Co-Authored-By: Claude Sonnet 5 <[email protected]>
Claude-Session: https://claude.ai/code/session_01GRDjHGgpYmMoPE2UFbe7pP
2026-09-11 12:11:19 +04:00

476 lines
20 KiB
C++

#include "sched/scheduler.hpp"
#include <algorithm>
#include <cctype>
#include <nlohmann/json.hpp>
#include "sched/schedule_window.hpp"
#include "store/segments.hpp"
#include "store/settings.hpp"
#include "store/tasks.hpp"
namespace velox::daemon::sched {
namespace proto = velox::proto;
namespace {
std::tm local_now_default() {
const std::time_t t = std::time(nullptr);
std::tm tm{};
::localtime_r(&t, &tm);
return tm;
}
// host[:port] out of a URL, lowercased. "" when it cannot be parsed (opts the task out of
// the per-host cap rather than lumping unrelated tasks under "").
std::string host_of(std::string_view url) {
auto scheme = url.find("://");
std::string_view rest = scheme == std::string_view::npos ? url : url.substr(scheme + 3);
const auto at = rest.find('@');
if (at != std::string_view::npos) rest = rest.substr(at + 1);
const auto end = rest.find_first_of("/:?#");
std::string h(end == std::string_view::npos ? rest : rest.substr(0, end));
std::transform(h.begin(), h.end(), h.begin(),
[](unsigned char c) { return static_cast<char>(std::tolower(c)); });
return h;
}
// ISO-8601 timestamp -> a monotonic integer for FIFO tiebreaking ("2026-09-10T15:57:50Z"
// -> 20260910155750). Lexical order of the digits is chronological.
std::int64_t rank_of(std::string_view iso) {
std::string digits;
for (char c : iso)
if (std::isdigit(static_cast<unsigned char>(c))) digits.push_back(c);
digits.resize(std::min<std::size_t>(digits.size(), 17)); // fits in int64
return digits.empty() ? 0 : std::stoll(digits);
}
RunState run_state_of(const std::string& s) {
if (s == "queued") return RunState::Queued;
if (s == "paused") return RunState::Paused;
if (s == "complete" || s == "failed" || s == "cancelled") return RunState::Terminal;
return RunState::Running; // probing / connecting / downloading / retry_wait / assembling / verifying
}
std::optional<PauseReason> pause_reason_of(const std::optional<std::string>& s) {
if (!s) return std::nullopt;
if (*s == "user") return PauseReason::User;
if (*s == "schedule") return PauseReason::Schedule;
if (*s == "queue_stopped") return PauseReason::QueueStopped;
if (*s == "admission_reconcile") return PauseReason::AdmissionReconcile;
if (*s == "auto") return PauseReason::Auto;
return std::nullopt;
}
const char* pause_reason_str(PauseReason r) {
switch (r) {
case PauseReason::User: return "user";
case PauseReason::Schedule: return "schedule";
case PauseReason::QueueStopped: return "queue_stopped";
case PauseReason::AdmissionReconcile: return "admission_reconcile";
case PauseReason::Auto: return "auto";
}
return "user";
}
const char* engine_state_name(vdm::task::EngineState s) {
using E = vdm::task::EngineState;
switch (s) {
case E::probing: return "probing";
case E::connecting: return "connecting";
case E::downloading: return "downloading";
case E::paused: return "paused";
case E::retry_wait: return "retry_wait";
case E::assembling: return "assembling";
case E::verifying: return "verifying";
case E::complete: return "complete";
case E::failed: return "failed";
case E::cancelled: return "cancelled";
}
return "connecting";
}
// The non-terminal states the scheduler cares about — feeds the tasks.list filter.
std::vector<proto::TaskState> non_terminal_states() {
return {proto::TaskState::New, proto::TaskState::Probing,
proto::TaskState::Queued, proto::TaskState::Connecting,
proto::TaskState::Downloading, proto::TaskState::Paused,
proto::TaskState::RetryWait, proto::TaskState::Assembling,
proto::TaskState::Verifying};
}
TaskErrorFields to_error_fields(const vdm::ErrorInfo& err) {
TaskErrorFields ef;
ef.code = std::string(vdm::error_name(err.code)); // matches TaskErrorCode by name (ADR 0010)
ef.message = err.context;
if (err.http_status != 0) ef.http_status = err.http_status;
ef.retryable = err.retryable;
return ef;
}
std::string segment_state_name(vdm::segment::SegState s) {
using S = vdm::segment::SegState;
switch (s) {
case S::idle: return "pending";
case S::connecting: return "connecting";
case S::downloading: return "downloading";
case S::stalled: return "stalled";
case S::complete: return "complete";
case S::failed: return "failed";
}
return "pending";
}
} // namespace
Scheduler::Scheduler(store::Db& db, EnginePort& engine, Governor governor, rpc::EventHub* hub,
Deps deps)
: db_(db), engine_(engine), governor_(std::move(governor)), hub_(hub), deps_(std::move(deps)) {
if (!deps_.local_now) deps_.local_now = local_now_default;
if (!deps_.post_to_loop) deps_.post_to_loop = [](std::function<void()> f) { f(); };
}
void Scheduler::map(const std::string& wire_id, vdm::TaskId engine_id) {
to_engine_[wire_id] = engine_id;
to_wire_[engine_id] = wire_id;
}
void Scheduler::unmap_engine(vdm::TaskId engine_id) {
if (auto it = to_wire_.find(engine_id); it != to_wire_.end()) {
to_engine_.erase(it->second);
to_wire_.erase(it);
}
}
std::optional<std::string> Scheduler::wire_id_of(vdm::TaskId id) const {
auto it = to_wire_.find(id);
return it == to_wire_.end() ? std::nullopt : std::optional<std::string>(it->second);
}
std::optional<vdm::TaskId> Scheduler::engine_id_of(const std::string& wire_id) const {
auto it = to_engine_.find(wire_id);
return it == to_engine_.end() ? std::nullopt : std::optional<vdm::TaskId>(it->second);
}
store::DbResult<void> Scheduler::reconcile_after_restart() {
// Any CORE-owned state (probing..verifying) becomes `queued`; the engine knows nothing
// across a restart and will re-probe / re-resume from the .veloxpart.meta sidecar when
// the scheduler starts it again (ADR 0013 §5). `paused` and `new` are left alone.
return db_.exec(
"UPDATE tasks SET state = 'queued', pause_reason = NULL "
"WHERE state IN ('probing','connecting','downloading','retry_wait','assembling','verifying')");
}
store::DbResult<void> Scheduler::reload_config() {
store::Settings settings(db_);
GovernorConfig cfg;
cfg.max_concurrent_downloads = settings.get_int("connection.maxConcurrentDownloads");
cfg.max_active_segments = settings.get_int("connection.maxActiveSegments");
// Per-host caps: a JSON object {host: n} under a daemon-local key. Absent => none.
if (auto raw = settings.get_raw("saveTo.hostSegmentCaps"); raw && *raw) {
auto j = nlohmann::json::parse(**raw, nullptr, false);
if (j.is_object()) {
for (const auto& [host, n] : j.items()) {
if (n.is_number_integer()) {
const auto cap = n.get<std::int64_t>();
cfg.host_caps[host] = cap;
engine_.set_host_segment_cap(host, static_cast<std::uint32_t>(std::max<std::int64_t>(cap, 0)));
}
}
}
}
governor_.set_config(cfg);
engine_.set_max_active_segments(
static_cast<std::uint32_t>(std::max<std::int64_t>(cfg.max_active_segments, 1)));
return {};
}
store::DbResult<void> Scheduler::tick() {
// --- snapshot: queues -----------------------------------------------------------
std::vector<QueueView> queues;
{
auto st = db_.prepare("SELECT queue_id, state, max_concurrent, schedule FROM queues");
if (!st) return std::unexpected(st.error());
const std::tm now = deps_.local_now();
for (;;) {
auto row = st->step();
if (!row) return std::unexpected(row.error());
if (!*row) break;
QueueView q;
q.queue_id = st->column_text(0);
q.running = st->column_text(1) == "running";
q.max_concurrent = st->column_int(2);
if (!st->column_is_null(3)) {
auto j = nlohmann::json::parse(st->column_text(3), nullptr, false);
proto::Schedule sched;
if (auto p = proto::parse<proto::Schedule>(j, "schedule")) sched = *p;
q.window_open = window_open(sched, now);
}
queues.push_back(std::move(q));
}
}
// --- snapshot: tasks ----------------------------------------------------------
store::Tasks tasks(db_);
proto::TaskFilter filter;
filter.states = non_terminal_states();
auto page = tasks.list(filter, std::nullopt, 0, 100000);
if (!page) return std::unexpected(page.error());
std::vector<TaskView> views;
views.reserve(page->rows.size());
for (const auto& r : page->rows) {
if (r.state == "new") continue; // parked until the user starts it
TaskView v;
v.task_id = r.task_id;
v.run_state = run_state_of(r.state);
v.pause_reason = pause_reason_of(r.pause_reason);
v.queue_id = r.queue_id;
v.queue_position = r.queue_position.value_or(0);
v.host = host_of(r.url);
v.admit_rank = rank_of(r.created_at);
views.push_back(std::move(v));
}
const Decision d = governor_.evaluate(views, queues);
// --- apply ------------------------------------------------------------------
// to_start: probe first, always — a real ProbeResult (size, resumable, validator) is
// what makes sizeBytes/resumable correct on the wire, not a post-hoc guess. The task
// moves to `probing` immediately so the governor does not re-admit it on the next
// tick while the (possibly slow, always async) probe is outstanding.
for (const auto& wire_id : d.to_start) {
auto got = tasks.get(wire_id);
if (!got || !got->has_value()) continue;
const store::TaskRow& row = **got;
transition(wire_id, "probing", std::nullopt, std::nullopt);
vdm::net::ProbeRequest req;
req.url = row.url;
// headers / cookies / referrer / user_agent are not persisted yet (a URL-only
// `velox add` has none); the capture path will fill them when it lands.
const std::string id_copy = wire_id;
engine_.probe(req, [this, id_copy](vdm::Result<vdm::net::ProbeResult> pr) {
deps_.post_to_loop([this, id_copy, pr]() { on_probe_result(id_copy, pr); });
});
}
for (const auto& wire_id : d.to_resume) {
if (auto eid = engine_id_of(wire_id)) {
engine_.resume(*eid);
transition(wire_id, "connecting", std::nullopt, std::nullopt);
}
}
for (const auto& wire_id : d.to_pause) {
const auto reason = d.pause_reasons.count(wire_id)
? pause_reason_str(d.pause_reasons.at(wire_id))
: "user";
if (auto eid = engine_id_of(wire_id)) engine_.pause(*eid);
transition(wire_id, "paused", std::string(reason), std::nullopt);
}
std::vector<vdm::TaskId> order;
order.reserve(d.priority_order.size());
for (const auto& wire_id : d.priority_order)
if (auto eid = engine_id_of(wire_id)) order.push_back(*eid);
engine_.set_task_order(order);
return {};
}
void Scheduler::transition(const std::string& wire_id, std::string_view to_state,
std::optional<std::string> pause_reason,
const std::optional<TaskErrorFields>& err) {
store::Tasks tasks(db_);
const auto before = tasks.get(wire_id);
const std::string previous = (before && before->has_value()) ? (**before).state : std::string();
// An engine-initiated pause carries an error => 'auto' (ADR 0013 §2), overriding
// whatever the caller passed (a scheduler-driven pause never carries an error here).
std::optional<std::string> reason = pause_reason;
if (to_state == "paused" && err) reason = "auto";
(void)tasks.set_state(wire_id, to_state, reason);
if (err) {
auto st = db_.prepare(
"UPDATE tasks SET error_code=?2, error_message=?3, error_http_status=?4, "
"error_retryable=?5 WHERE task_id=?1");
if (st) {
(void)st->bind(1, std::string_view(wire_id));
(void)st->bind(2, std::string_view(err->code));
(void)st->bind(3, std::string_view(err->message));
if (err->http_status) (void)st->bind(4, *err->http_status);
else (void)st->bind_null(4);
if (err->retryable) (void)st->bind(5, static_cast<std::int64_t>(*err->retryable));
else (void)st->bind_null(5);
(void)st->step();
}
}
if (!hub_) return;
auto after = tasks.get(wire_id);
if (!after || !after->has_value()) return;
const proto::TaskSummary summary = store::to_summary(**after);
nlohmann::json params{
{"taskId", wire_id},
{"state", std::string(to_state)},
{"previousState", previous.empty() ? nlohmann::json(nullptr) : nlohmann::json(previous)},
{"summary", summary},
{"error", summary.error.has_value() ? nlohmann::json(*summary.error) : nlohmann::json(nullptr)},
};
hub_->publish(proto::Event::TaskState, proto::make_notification(proto::Event::TaskState, params),
wire_id);
}
void Scheduler::on_engine_state(const std::string& wire_id, std::string_view from_state,
std::string_view to_state,
const std::optional<TaskErrorFields>& err) {
(void)from_state; // transition() reads the store's own current state as previousState,
// which is authoritative regardless of engine/store timing
transition(wire_id, to_state, std::nullopt, err);
if (to_state == "complete" || to_state == "failed" || to_state == "cancelled") {
if (auto eid = engine_id_of(wire_id)) {
// One last snapshot before the handle goes away: a task that never lived past
// a single tick (small/fast/local) would otherwise leave downloadedBytes and
// segmentDetail at their pre-segmentation defaults forever, in violation of
// TaskDetail.segmentDetail's "exactly summary.segments entries" contract.
if (const auto p = engine_.progress(*eid)) persist_progress(wire_id, *p);
engine_.release(*eid);
unmap_engine(*eid);
}
}
}
vdm::task::DownloadCallbacks Scheduler::make_callbacks(const std::string& wire_id) {
vdm::task::DownloadCallbacks cbs;
const std::string id_copy = wire_id;
cbs.on_state = [this, id_copy](vdm::task::EngineState from, vdm::task::EngineState to,
const std::optional<vdm::ErrorInfo>& err) {
std::optional<TaskErrorFields> ef;
if (err) ef = to_error_fields(*err);
const std::string from_name = engine_state_name(from);
const std::string to_name = engine_state_name(to);
deps_.post_to_loop([this, id_copy, from_name, to_name, ef]() {
on_engine_state(id_copy, from_name, to_name, ef);
});
};
cbs.on_finished = [this, id_copy](vdm::Result<vdm::task::DownloadOutcome> outcome) {
deps_.post_to_loop([this, id_copy, outcome]() { on_engine_finished(id_copy, outcome); });
};
return cbs;
}
void Scheduler::on_probe_result(const std::string& wire_id,
const vdm::Result<vdm::net::ProbeResult>& pr) {
auto got = store::Tasks(db_).get(wire_id);
if (!got || !got->has_value()) return; // removed while the probe was outstanding
const store::TaskRow& row = **got;
if (!pr) {
transition(wire_id, "failed", std::nullopt, to_error_fields(pr.error()));
return;
}
store::Tasks::ProbeFields fields;
if (pr->total_size) fields.size_bytes = static_cast<std::int64_t>(*pr->total_size);
fields.resumable = pr->resumable;
if (!pr->etag.empty()) fields.etag = pr->etag;
if (!pr->last_modified.empty()) fields.last_modified = pr->last_modified;
if (!pr->mime.empty()) fields.content_type = pr->mime;
if (pr->effective_url != row.url) fields.effective_url = pr->effective_url;
(void)store::Tasks(db_).set_probe_result(wire_id, fields);
vdm::task::DownloadSpec spec;
spec.url = row.url;
spec.save_path = row.save_dir + "/" + row.filename;
if (row.req_segments) spec.segments = static_cast<std::uint32_t>(*row.req_segments);
if (row.req_buffer_bytes) spec.buffer_bytes = static_cast<std::uint64_t>(*row.req_buffer_bytes);
if (row.checksum_algo && row.checksum_value) {
vdm::task::Checksum ck;
ck.hex = *row.checksum_value;
if (*row.checksum_algo == "md5") ck.algo = vdm::task::Checksum::Algo::md5;
else if (*row.checksum_algo == "sha1") ck.algo = vdm::task::Checksum::Algo::sha1;
else if (*row.checksum_algo == "sha512") ck.algo = vdm::task::Checksum::Algo::sha512;
else ck.algo = vdm::task::Checksum::Algo::sha256;
spec.checksum = ck;
}
spec.allow_resume = true; // resume from a sidecar if one is beside save_path
spec.probe_hint = *pr; // skip a second probe; the engine still revalidates on resume
const vdm::TaskId engine_id = engine_.start(spec, make_callbacks(wire_id));
map(wire_id, engine_id);
// State stays `probing`; the engine's own on_state (probe_hint => starts in
// `connecting`) drives the next transition through on_engine_state.
}
void Scheduler::on_engine_finished(const std::string& wire_id,
const vdm::Result<vdm::task::DownloadOutcome>& outcome) {
// The state transition (complete/failed/cancelled) already happened via on_state,
// which always precedes on_finished. This only tops up the byte count for a task that
// completed before any progress tick ran — otherwise a fast/local/small transfer
// reports downloadedBytes: 0 forever despite a byte-correct file on disk.
if (outcome) (void)store::Tasks(db_).set_final_bytes(wire_id, static_cast<std::int64_t>(outcome->bytes));
}
void Scheduler::persist_progress(const std::string& wire_id, const vdm::task::Progress& p) {
// TaskDetail.segmentDetail is contractually "exactly TaskSummary.segments entries" —
// so the count that goes on the wire as `segments` has to be the length of the list
// that actually becomes segmentDetail, not effective_segments (budget slots *held*,
// per engine_port.hpp; a small file can hold 8 fairness slots while its segmenter
// only ever carves 2 ranges). Falls back to effective_segments only before the task
// has any ranges yet, so a `probing`/`connecting` task still reports a sane count.
const std::int64_t seg_count = !p.segments.empty()
? static_cast<std::int64_t>(p.segments.size())
: static_cast<std::int64_t>(p.effective_segments);
(void)store::Tasks(db_).update_progress(wire_id, static_cast<std::int64_t>(p.downloaded),
static_cast<std::int64_t>(p.speed_bps), seg_count,
static_cast<std::int64_t>(p.effective_buffer_bytes));
if (!p.segments.empty()) {
std::vector<store::SegmentSnapshot> snaps;
snaps.reserve(p.segments.size());
for (const auto& s : p.segments) {
snaps.push_back({s.index, static_cast<std::int64_t>(s.start),
static_cast<std::int64_t>(s.end),
static_cast<std::int64_t>(s.completed),
static_cast<std::int64_t>(s.speed_bps),
segment_state_name(s.state)});
}
(void)store::Segments(db_).replace_all(wire_id, snaps);
}
}
std::vector<Scheduler::ProgressRow> Scheduler::progress_snapshot() {
std::vector<ProgressRow> out;
if (to_engine_.empty()) return out;
out.reserve(to_engine_.size());
for (const auto& [wire_id, engine_id] : to_engine_) {
const auto p = engine_.progress(engine_id);
if (!p) continue;
ProgressRow row;
row.task_id = wire_id;
row.downloaded_bytes = p->downloaded;
row.speed_bps = p->speed_bps;
row.eta_seconds = p->eta_seconds;
for (const auto& s : p->segments)
row.segments.push_back({s.index, s.completed, s.speed_bps});
out.push_back(std::move(row));
persist_progress(wire_id, *p);
}
return out;
}
} // namespace velox::daemon::sched