mirror of
https://github.com/EasyTier/EasyTier.git
synced 2026-10-08 19:06:14 -08:00
* fix(web): fence managed config runtime reconciliation Keep runtime reconciliation tied to the currently authorized session so stale connections cannot mutate a replacement session runtime. Accumulate only contiguous dirty IDs and load their latest SQLite state. Require the applied revision to match the earliest Patch base and the persisted revision to match the latest target. Otherwise, reconcile the full desired state. Use separate runtime-state and config-cache epochs. Managed updates can reuse observed configs; direct mutations invalidate them. Update sync documentation to match. * fix(web): interrupt validation retry on state changes Track meaningful validation state changes separately from periodic dirty signals. Applied revision changes wake a failed validation immediately, while heartbeat-driven revalidation retains the retry backoff. Treat Notify as a wake-up hint and recheck the state-change epoch after every wake so stored permits and periodic heartbeats cannot cause retry storms. * fix(web): retry unconfirmed connected webhooks Retry node-connected webhook delivery on retryable errors with a short 100ms/500ms backoff and give up immediately on non-retryable errors. Re-check that the session still owns the connection before every attempt and before recording the delivery, so a replaced session can no longer record a stale connected binding. * fix(web): fence disconnects by session ownership Return whether session removal actually removed the current route owner, and emit disconnected only for that owner. Replaced sessions can no longer invalidate a newer connected route. * fix(web): hot-patch managed hostnames Include hostname changes in the hot-patch path instead of falling back to a full restart. When a full overwrite run is required and the desired config has no hostname, inherit the current runtime hostname so an unmanaged value survives until it is explicitly cleared. Read back the runtime config after an overwrite run and verify it converged instead of assuming the desired state was applied. * fix(web): retry transient runtime reconciliation failures Keep the per-session managed runtime reconciliation worker alive when a single database round fails. Retry from the next heartbeat so persisted managed revisions can still converge after restart-time contention. Reserve terminal worker shutdown for destroyed session or storage state, and cover recovery after a transient revision read failure. * fix(web): accept omitted hostname after runtime apply Release 2.6.4 omits hostname from config readback when it matches the device hostname. Trust a successful hostname mutation only when the returned field is absent, while continuing to verify every other field and rejecting explicit mismatches. * fix(web): ignore unmanaged runtime device names Windows release 2.6.4 generates a random interface name when the managed config leaves dev_name empty. Exclude that runtime-owned value from reconciliation unless the desired config explicitly sets a non-empty device name, preventing endless overwrite restarts. * feat(web): report failed network instances to console Expose stopped Core instances with startup errors in heartbeats. Merge Core failures with direct managed-run RPC failures in easytier-web. Send failed instance IDs during token validation without error text. Prune local run failures when managed configs are deleted. * fix(web): distinguish unknown runtime application state Track whether the current session has observed its applied revision separately from the optional revision value. Report this fact through validate-token so Console can preserve application state across receiver restarts while recognizing deliberate pending mutations. * feat(web): configure heartbeat timing from server Heartbeat responses now provide the interval and RPC timeout. Legacy servers use local defaults and remote values are clamped. Web configuration and session receive timeout follow the policy. * fix(web): reject inactive control sessions Route control RPCs by machine id only to sessions whose RPC manager is still running, so a session that has been stopped or replaced can no longer receive control traffic addressed to the device. * fix(core): filter network info before collection When a collect-network-info request names specific instances, collect those instances only instead of collecting every instance and filtering the result afterwards, so unrequested instances no longer run per-collection work on every request. * feat(web): enable focused runtime diagnostics Enable easytier-web info logs by default while preserving explicit log configuration. Record startup settings, session lifecycle, failed instance changes, webhook queue and request latency, and managed runtime operation timings for production diagnosis. * fix(web): preserve managed revision across reconnects Keep one runtime identifier for each Core WebClient lifetime. Reuse its managed runtime state after transport reconnects. Retain applied revisions and reconcile hints while disconnected. Preserve runtime epochs so stale work cannot mark a revision applied. Reject stale sessions from reclaiming routes after reconnect. Core or Web restarts and legacy clients still use unknown state. Immediately revalidate a restored revision after authentication. Document local management RPC drift as an accepted trade-off. This lets Console converge without waiting for periodic validation. * fix(web): satisfy clippy across managed config sync tests Scope managed runtime guards to blocks in runtime revision tests so no std MutexGuard is held across await points, return the applied revision directly instead of through a let binding, and pass WebhookValidationInput to request_heartbeat_validation instead of expanding it into eight separate arguments. * fix(core): stop reporting failed instances as running in heartbeats A stopped instance with a startup error appeared in both running_network_instances and failed_network_instances, so the server treated it as running and never re-ran its managed config. Exclude failed instance ids when building the running list so the reconciler restarts them. * fix(core): close missed-wakeup race in instance state changes wait_for_change created the Notified future before reading the generation but only registered it when awaited. A change landing in between fired notify_waiters with no registered waiter and delayed the heartbeat by a full interval. Enable the future before reading the generation so every change wakes a waiting heartbeat. * fix(web): address review findings Fence webhook validation and connection transitions against stale state, redact credentials from default-level logs, and stabilize runtime reconciliation: - Record connected bindings only while the session still owns the machine route, and skip disconnect compensation once a replacement owns the route so a stale disconnect cannot revoke it. - Discard webhook validation results when the change epoch moved during the HTTP round, so a stale rejection cannot invalidate the current session. - Drop user_token fields from info and warn logs that became visible with info-level defaults. - Restore a hostname omitted by the 2.6.4 readback into the cached runtime config after a successful mutation, so later rounds stop re-sending the same hostname patch. - Reconcile running web configs when no revision is tracked so legacy unrevisioned updates converge, and wake sessions for unrevisioned full updates instead of waiting for the next heartbeat. * chore(go): regenerate web proto bindings for heartbeat fields Add failed_network_instances, support_heartbeat_policy, and the heartbeat policy response fields to the checked-in Go bindings. Other proto packages are left as-is because their drift predates this change. * fix(web): redact user tokens from positional log arguments Three runtime reconciliation info logs and the user lookup error contexts printed user_token through format arguments, which the earlier field-syntax redaction missed. The reconcile log now fires every round for unrevisioned machines, so remove the token from these messages as well. * fix(web): fence stale validation and runtime reconcile rounds Check webhook validation epochs while holding the session write lock, so stale success and rejection responses cannot change session state. Advance the runtime epoch for unrevisioned full config updates, and exclude failed instances from heartbeat and RPC reconciliation lists so stopped instances are restarted instead of repeatedly hot-patched. Release test read guards before awaiting validation apply calls. Set up the no-pending condition before asserting that an applied revision is a no-op, and verify that its runtime epoch remains unchanged. Validation: all 137 client_manager tests passed. * test(credentials): cover P2P with active VPN portal Model an admin and temporary credential peer connected as a foreign network through a public server with data relay disabled. Verify their direct connection can be replaced after a WireGuard portal client comes online. * test(credentials): stabilize two-admins failover assertions The two-admins non-reusable credential test could fail on slow convergence: after dropping the winning peer it relied on a single route sample passing a bare AND condition, then re-asserted the same expectations through one-shot checks seconds later. A transient route flap in that window (for example a briefly resurrected winner route from stale conn info) turned a passing convergence into a hard assert failure. This matches the 48.9s CI flake of credential_non_reusable_across_two_admins_allows_only_one_peer observed on 2026-08-12. Changes: - wait for bidirectional admin connectivity (AND) with a 20s budget before issuing the credential, instead of a one-directional OR - replace the failover wait_for_condition with wait_stable_failover_visibility_on_admins, which requires three consecutive samples of loser-present and winner-absent on both admins within the same 60s budget and logs every sample - enrich the stable-single-winner timeout message with per-admin visibility flags and elapsed time for triage All existing contracts are preserved; only observation windows and diagnostics change. Validated in the rust container: three passes at normal speed (54.1s / 53.8s / 53.1s) plus one slow-convergence round (172.7s) that would have raced the old one-shot sampling; it now passes with failover samples logged. cargo fmt and clippy -D warnings clean.
2070 lines
71 KiB
Rust
2070 lines
71 KiB
Rust
use std::collections::{HashMap, HashSet};
|
|
|
|
use easytier::proto::{
|
|
api::manage::{
|
|
DeleteNetworkInstanceRequest, DeleteNetworkInstanceResponse,
|
|
ListNetworkInstanceMetaRequest, ListNetworkInstanceRequest, NetworkConfig, NetworkMeta,
|
|
RunNetworkInstanceRequest,
|
|
},
|
|
rpc_types::controller::BaseController,
|
|
web::HeartbeatRequest,
|
|
};
|
|
use easytier_core::management::remote_client::{ListNetworkProps, Storage as _};
|
|
use tokio::sync::{RwLock, broadcast};
|
|
|
|
use super::{
|
|
ManagedConfigReconcileHint, SessionConfigClient, SessionData, SessionRpcClient,
|
|
SessionRpcService,
|
|
};
|
|
use crate::client_manager::{
|
|
managed_config::{self, PersistedConfigSource},
|
|
runtime_reconcile,
|
|
storage::{StorageInner, WeakRefStorage},
|
|
};
|
|
|
|
async fn recv_latest_heartbeat(
|
|
heartbeat_waiter: &mut broadcast::Receiver<HeartbeatRequest>,
|
|
) -> Option<HeartbeatRequest> {
|
|
let mut req = loop {
|
|
match heartbeat_waiter.recv().await {
|
|
Ok(req) => break req,
|
|
Err(broadcast::error::RecvError::Lagged(skipped)) => {
|
|
tracing::warn!(
|
|
skipped,
|
|
"heartbeat reconcile worker lagged, waiting for latest request"
|
|
);
|
|
}
|
|
Err(broadcast::error::RecvError::Closed) => {
|
|
tracing::error!("Failed to receive heartbeat request: channel closed");
|
|
return None;
|
|
}
|
|
}
|
|
};
|
|
|
|
// Drop any heartbeat backlog accumulated while the previous reconcile
|
|
// round was doing DB/RPC IO. The newest heartbeat has the freshest
|
|
// runtime instance list, which is all this task needs.
|
|
loop {
|
|
match heartbeat_waiter.try_recv() {
|
|
Ok(next_req) => req = next_req,
|
|
Err(broadcast::error::TryRecvError::Empty) => break,
|
|
Err(broadcast::error::TryRecvError::Lagged(_)) => continue,
|
|
Err(broadcast::error::TryRecvError::Closed) => return None,
|
|
}
|
|
}
|
|
|
|
Some(req)
|
|
}
|
|
|
|
pub(super) async fn reconcile_network_configs_on_heartbeat(
|
|
session_data: std::sync::Weak<RwLock<SessionData>>,
|
|
mut heartbeat_waiter: broadcast::Receiver<HeartbeatRequest>,
|
|
storage: WeakRefStorage,
|
|
mut rpc_client: SessionRpcClient,
|
|
mut config_client: SessionConfigClient,
|
|
) {
|
|
let mut cache = ReconcileCache::default();
|
|
loop {
|
|
let Some(req) = recv_latest_heartbeat(&mut heartbeat_waiter).await else {
|
|
return;
|
|
};
|
|
let Some(storage) = storage.upgrade() else {
|
|
tracing::error!("Failed to get storage");
|
|
return;
|
|
};
|
|
|
|
let mut round =
|
|
match prepare_reconcile_round(&session_data, &storage, &mut rpc_client, req).await {
|
|
RoundStatus::Ready(round) => round,
|
|
RoundStatus::Skip => continue,
|
|
RoundStatus::Stop => return,
|
|
};
|
|
cache.reset_if_runtime_config_cache_epoch_changed(round.runtime_config_cache_epoch);
|
|
let running_metas =
|
|
match sync_running_sources_for_round(&mut rpc_client, &storage, &mut round).await {
|
|
RoundStatus::Ready(running_metas) => running_metas,
|
|
RoundStatus::Skip => continue,
|
|
RoundStatus::Stop => return,
|
|
};
|
|
let context = ReconcileRoundContext {
|
|
session_data: &session_data,
|
|
round: &round,
|
|
};
|
|
match cleanup_direct_run_failures_for_round(&context).await {
|
|
RoundStatus::Ready(()) => {}
|
|
RoundStatus::Skip => continue,
|
|
RoundStatus::Stop => return,
|
|
}
|
|
let mut mutation_fence = RuntimeMutationFence::default();
|
|
|
|
let mut outcome = match &round.scope {
|
|
ReconcileScope::Full => {
|
|
let desired_web_inst_ids =
|
|
managed_config::desired_web_source_instance_ids(&round.local_configs);
|
|
cache.runtime_configs.retain_desired(&desired_web_inst_ids);
|
|
match cleanup_stale_web_source_instances(
|
|
&context,
|
|
&storage,
|
|
&mut rpc_client,
|
|
running_metas.as_deref(),
|
|
&desired_web_inst_ids,
|
|
&mut cache,
|
|
&mut mutation_fence,
|
|
)
|
|
.await
|
|
{
|
|
RoundStatus::Ready(outcome) => outcome,
|
|
RoundStatus::Skip => continue,
|
|
RoundStatus::Stop => return,
|
|
}
|
|
}
|
|
ReconcileScope::Patch { .. } => {
|
|
match cleanup_patch_deleted_instances(
|
|
&session_data,
|
|
&mut rpc_client,
|
|
&round,
|
|
running_metas.as_deref(),
|
|
&round.delete_instance_ids,
|
|
&mut cache,
|
|
&mut mutation_fence,
|
|
)
|
|
.await
|
|
{
|
|
RoundStatus::Ready(outcome) => outcome,
|
|
RoundStatus::Skip => continue,
|
|
RoundStatus::Stop => return,
|
|
}
|
|
}
|
|
};
|
|
|
|
outcome.merge(
|
|
reconcile_desired_runtime_configs(
|
|
&context,
|
|
&mut rpc_client,
|
|
&mut config_client,
|
|
&mut cache,
|
|
&mut mutation_fence,
|
|
)
|
|
.await,
|
|
);
|
|
|
|
if !outcome.has_failed {
|
|
match &round.scope {
|
|
ReconcileScope::Full => {
|
|
cache.last_desired_web_inst_ids = Some(
|
|
managed_config::desired_web_source_instance_ids(&round.local_configs),
|
|
);
|
|
}
|
|
ReconcileScope::Patch { dirty_instance_ids } => {
|
|
if let Some(last) = &mut cache.last_desired_web_inst_ids {
|
|
last.retain(|id| !dirty_instance_ids.contains(id));
|
|
last.extend(
|
|
round
|
|
.local_configs
|
|
.iter()
|
|
.map(|config| config.network_instance_id.clone()),
|
|
);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
match mark_config_revision_applied_if_current(
|
|
&session_data,
|
|
&storage,
|
|
&round,
|
|
&outcome,
|
|
&mutation_fence,
|
|
)
|
|
.await
|
|
{
|
|
RoundStatus::Ready(()) | RoundStatus::Skip => {}
|
|
RoundStatus::Stop => return,
|
|
}
|
|
}
|
|
}
|
|
|
|
enum RoundStatus<T> {
|
|
Ready(T),
|
|
Skip,
|
|
Stop,
|
|
}
|
|
|
|
#[derive(Clone, Copy, PartialEq, Eq)]
|
|
enum ConfigActionResult {
|
|
Success,
|
|
Failed,
|
|
StopRound,
|
|
}
|
|
|
|
#[derive(Default)]
|
|
struct ReconcileCache {
|
|
runtime_config_cache_epoch: u64,
|
|
cleaned_web_source_instances: bool,
|
|
last_desired_web_inst_ids: Option<HashSet<String>>,
|
|
runtime_configs: SessionRuntimeConfigCache,
|
|
}
|
|
|
|
impl ReconcileCache {
|
|
fn reset_if_runtime_config_cache_epoch_changed(&mut self, current_epoch: u64) {
|
|
if self.runtime_config_cache_epoch == current_epoch {
|
|
return;
|
|
}
|
|
*self = Self {
|
|
runtime_config_cache_epoch: current_epoch,
|
|
..Default::default()
|
|
};
|
|
}
|
|
}
|
|
|
|
#[derive(Default)]
|
|
struct SessionRuntimeConfigCache {
|
|
entries: HashMap<String, NetworkConfig>,
|
|
}
|
|
|
|
impl SessionRuntimeConfigCache {
|
|
fn plan(
|
|
&self,
|
|
inst_id: &str,
|
|
desired_config: NetworkConfig,
|
|
) -> anyhow::Result<Option<runtime_reconcile::RuntimeReconcileAction>> {
|
|
let Some(observed_config) = self.entries.get(inst_id) else {
|
|
return Ok(None);
|
|
};
|
|
|
|
runtime_reconcile::prepare_web_source_runtime_reconcile_from_current(
|
|
observed_config,
|
|
desired_config,
|
|
)
|
|
.map(Some)
|
|
}
|
|
|
|
fn remember(&mut self, inst_id: &str, observed_config: NetworkConfig) {
|
|
self.entries.insert(inst_id.to_string(), observed_config);
|
|
}
|
|
|
|
fn forget(&mut self, inst_id: &str) {
|
|
self.entries.remove(inst_id);
|
|
}
|
|
|
|
fn forget_many<'a>(&mut self, inst_ids: impl IntoIterator<Item = &'a String>) {
|
|
for inst_id in inst_ids {
|
|
self.entries.remove(inst_id);
|
|
}
|
|
}
|
|
|
|
fn retain_desired(&mut self, desired_web_inst_ids: &HashSet<String>) {
|
|
self.entries
|
|
.retain(|inst_id, _| desired_web_inst_ids.contains(inst_id));
|
|
}
|
|
}
|
|
|
|
#[derive(Default)]
|
|
struct ReconcileOutcome {
|
|
has_failed: bool,
|
|
managed_revision_failed: bool,
|
|
}
|
|
|
|
#[derive(Default)]
|
|
struct RuntimeMutationFence {
|
|
started: bool,
|
|
}
|
|
|
|
impl ReconcileOutcome {
|
|
fn record_failure(&mut self, managed_revision_failed: bool) {
|
|
self.has_failed = true;
|
|
self.managed_revision_failed |= managed_revision_failed;
|
|
}
|
|
|
|
fn merge(&mut self, other: Self) {
|
|
self.has_failed |= other.has_failed;
|
|
self.managed_revision_failed |= other.managed_revision_failed;
|
|
}
|
|
}
|
|
|
|
struct ReconcileRound {
|
|
req: HeartbeatRequest,
|
|
machine_id: uuid::Uuid,
|
|
user_id: i32,
|
|
running_inst_ids: HashSet<String>,
|
|
local_configs: Vec<crate::db::entity::user_running_network_configs::Model>,
|
|
delete_instance_ids: HashSet<String>,
|
|
target_config_revision: Option<String>,
|
|
should_apply_runtime_revision: bool,
|
|
scope: ReconcileScope,
|
|
runtime_config_epoch: u64,
|
|
runtime_config_cache_epoch: u64,
|
|
}
|
|
|
|
struct ReconcileRoundContext<'a> {
|
|
session_data: &'a std::sync::Weak<RwLock<SessionData>>,
|
|
round: &'a ReconcileRound,
|
|
}
|
|
|
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
enum ReconcileScope {
|
|
Full,
|
|
Patch { dirty_instance_ids: HashSet<String> },
|
|
}
|
|
|
|
fn select_reconcile_scope(
|
|
pending: Option<&ManagedConfigReconcileHint>,
|
|
known_runtime_base_revision: Option<&str>,
|
|
target_revision: Option<&str>,
|
|
) -> ReconcileScope {
|
|
match pending {
|
|
Some(ManagedConfigReconcileHint::Dirty {
|
|
expected_revision,
|
|
target_revision: dirty_target,
|
|
instance_ids,
|
|
}) if known_runtime_base_revision == Some(expected_revision.as_str())
|
|
&& target_revision == Some(dirty_target.as_str()) =>
|
|
{
|
|
ReconcileScope::Patch {
|
|
dirty_instance_ids: instance_ids.clone(),
|
|
}
|
|
}
|
|
_ => ReconcileScope::Full,
|
|
}
|
|
}
|
|
|
|
async fn prepare_reconcile_round(
|
|
session_data: &std::sync::Weak<RwLock<SessionData>>,
|
|
storage: &StorageInner,
|
|
rpc_client: &mut SessionRpcClient,
|
|
req: HeartbeatRequest,
|
|
) -> RoundStatus<ReconcileRound> {
|
|
let Some(machine_id) = req.machine_id.map(uuid::Uuid::from) else {
|
|
tracing::warn!(?req, "Machine id is not set, ignore");
|
|
return RoundStatus::Skip;
|
|
};
|
|
if !SessionRpcService::runtime_heartbeat_is_current(session_data, &req).await {
|
|
tracing::debug!(?machine_id, "skip stale heartbeat reconcile request");
|
|
return RoundStatus::Skip;
|
|
}
|
|
|
|
let user_id = match storage
|
|
.db
|
|
.get_user_id_by_token(req.user_token.clone())
|
|
.await
|
|
{
|
|
Ok(Some(user_id)) => user_id,
|
|
Ok(None) => {
|
|
tracing::info!(
|
|
machine_id = ?req.machine_id,
|
|
"user not found by heartbeat token"
|
|
);
|
|
return RoundStatus::Skip;
|
|
}
|
|
Err(e) => {
|
|
tracing::error!("Failed to get user id by token, error: {:?}", e);
|
|
return RoundStatus::Skip;
|
|
}
|
|
};
|
|
|
|
let (
|
|
applied_config_revision,
|
|
known_runtime_base_revision,
|
|
pending_reconcile,
|
|
runtime_config_epoch,
|
|
runtime_config_cache_epoch,
|
|
failed_instance_ids,
|
|
) = {
|
|
let Some(data) = session_data.upgrade() else {
|
|
return RoundStatus::Stop;
|
|
};
|
|
let data = data.read().await;
|
|
let runtime = data.managed_runtime();
|
|
(
|
|
runtime.applied_config_revision.clone(),
|
|
runtime.known_runtime_base_revision.clone(),
|
|
runtime.pending_managed_config_reconcile.clone(),
|
|
runtime.runtime_config_epoch,
|
|
runtime.runtime_config_cache_epoch,
|
|
SessionRpcService::failed_instance_ids_locked(&data),
|
|
)
|
|
};
|
|
let target_config_revision =
|
|
match read_managed_config_revision(storage, user_id, machine_id).await {
|
|
RoundStatus::Ready(revision) => revision,
|
|
RoundStatus::Skip => return RoundStatus::Skip,
|
|
RoundStatus::Stop => return RoundStatus::Stop,
|
|
};
|
|
let should_apply_runtime_revision =
|
|
target_config_revision.is_some() && target_config_revision != applied_config_revision;
|
|
let mut scope = if should_apply_runtime_revision {
|
|
select_reconcile_scope(
|
|
pending_reconcile.as_ref(),
|
|
known_runtime_base_revision.as_deref(),
|
|
target_config_revision.as_deref(),
|
|
)
|
|
} else {
|
|
ReconcileScope::Full
|
|
};
|
|
let running_inst_ids = match running_instance_ids_for_round(
|
|
rpc_client,
|
|
&req,
|
|
user_id,
|
|
machine_id,
|
|
should_apply_runtime_revision,
|
|
&failed_instance_ids,
|
|
)
|
|
.await
|
|
{
|
|
RoundStatus::Ready(ids) => ids,
|
|
RoundStatus::Skip => return RoundStatus::Skip,
|
|
RoundStatus::Stop => return RoundStatus::Stop,
|
|
};
|
|
|
|
let (local_configs, delete_instance_ids) = match load_round_configs(
|
|
storage, user_id, machine_id, &scope,
|
|
)
|
|
.await
|
|
{
|
|
Ok(Some(configs)) => configs,
|
|
Ok(None) => {
|
|
tracing::warn!(
|
|
?user_id,
|
|
?machine_id,
|
|
"Managed config dirty instance is no longer a web-owned row; using Full reconcile"
|
|
);
|
|
scope = ReconcileScope::Full;
|
|
match storage
|
|
.db
|
|
.list_network_configs((user_id, machine_id), ListNetworkProps::EnabledOnly)
|
|
.await
|
|
{
|
|
Ok(configs) => (configs, HashSet::new()),
|
|
Err(e) => {
|
|
tracing::error!("Failed to list network configs, error: {:?}", e);
|
|
return RoundStatus::Skip;
|
|
}
|
|
}
|
|
}
|
|
Err(e) => {
|
|
tracing::error!("Failed to load managed config Patch rows, error: {:?}", e);
|
|
return RoundStatus::Skip;
|
|
}
|
|
};
|
|
|
|
RoundStatus::Ready(ReconcileRound {
|
|
req,
|
|
machine_id,
|
|
user_id,
|
|
running_inst_ids,
|
|
local_configs,
|
|
delete_instance_ids,
|
|
target_config_revision,
|
|
should_apply_runtime_revision,
|
|
scope,
|
|
runtime_config_epoch,
|
|
runtime_config_cache_epoch,
|
|
})
|
|
}
|
|
|
|
async fn update_direct_run_failures_if_current(
|
|
session_data: &std::sync::Weak<RwLock<SessionData>>,
|
|
round: &ReconcileRound,
|
|
update: impl FnOnce(&mut SessionData) -> Option<std::sync::Arc<tokio::sync::Notify>>,
|
|
) -> RoundStatus<()> {
|
|
let Some(data) = session_data.upgrade() else {
|
|
return RoundStatus::Stop;
|
|
};
|
|
let notify = {
|
|
let mut data = data.write().await;
|
|
if !SessionRpcService::runtime_heartbeat_is_current_locked(&data, &round.req) {
|
|
return RoundStatus::Skip;
|
|
}
|
|
if data.managed_runtime().runtime_config_epoch != round.runtime_config_epoch {
|
|
return RoundStatus::Skip;
|
|
}
|
|
update(&mut data)
|
|
};
|
|
if let Some(notify) = notify {
|
|
notify.notify_one();
|
|
}
|
|
RoundStatus::Ready(())
|
|
}
|
|
|
|
async fn cleanup_direct_run_failures_for_round(
|
|
context: &ReconcileRoundContext<'_>,
|
|
) -> RoundStatus<()> {
|
|
let desired_instance_ids =
|
|
managed_config::desired_web_source_instance_ids(&context.round.local_configs);
|
|
update_direct_run_failures_if_current(
|
|
context.session_data,
|
|
context.round,
|
|
|data| match &context.round.scope {
|
|
ReconcileScope::Full => {
|
|
SessionRpcService::retain_direct_run_failures_locked(data, &desired_instance_ids)
|
|
}
|
|
ReconcileScope::Patch { .. } => SessionRpcService::remove_direct_run_failures_locked(
|
|
data,
|
|
&context.round.delete_instance_ids,
|
|
),
|
|
},
|
|
)
|
|
.await
|
|
}
|
|
|
|
async fn read_managed_config_revision(
|
|
storage: &StorageInner,
|
|
user_id: i32,
|
|
machine_id: uuid::Uuid,
|
|
) -> RoundStatus<Option<String>> {
|
|
match storage
|
|
.db
|
|
.get_managed_config_revision((user_id, machine_id))
|
|
.await
|
|
{
|
|
Ok(revision) => RoundStatus::Ready(revision),
|
|
Err(e) => {
|
|
tracing::error!("Failed to read managed config revision, error: {:?}", e);
|
|
RoundStatus::Skip
|
|
}
|
|
}
|
|
}
|
|
|
|
async fn load_round_configs(
|
|
storage: &StorageInner,
|
|
user_id: i32,
|
|
machine_id: uuid::Uuid,
|
|
scope: &ReconcileScope,
|
|
) -> Result<
|
|
Option<(
|
|
Vec<crate::db::entity::user_running_network_configs::Model>,
|
|
HashSet<String>,
|
|
)>,
|
|
sea_orm::DbErr,
|
|
> {
|
|
let ReconcileScope::Patch { dirty_instance_ids } = scope else {
|
|
return storage
|
|
.db
|
|
.list_network_configs((user_id, machine_id), ListNetworkProps::EnabledOnly)
|
|
.await
|
|
.map(|configs| Some((configs, HashSet::new())));
|
|
};
|
|
|
|
let mut instance_ids = dirty_instance_ids.iter().collect::<Vec<_>>();
|
|
instance_ids.sort_unstable();
|
|
let mut configs = Vec::with_capacity(instance_ids.len());
|
|
let mut delete_instance_ids = HashSet::new();
|
|
for instance_id in instance_ids {
|
|
let config = storage
|
|
.db
|
|
.get_network_config((user_id, machine_id), instance_id)
|
|
.await?;
|
|
match config {
|
|
Some(config)
|
|
if !config.disabled
|
|
&& PersistedConfigSource::from_db(&config.source)
|
|
== PersistedConfigSource::Web =>
|
|
{
|
|
configs.push(config);
|
|
}
|
|
None => {
|
|
delete_instance_ids.insert(instance_id.clone());
|
|
}
|
|
Some(_) => return Ok(None),
|
|
}
|
|
}
|
|
Ok(Some((configs, delete_instance_ids)))
|
|
}
|
|
|
|
async fn running_instance_ids_for_round(
|
|
rpc_client: &mut SessionRpcClient,
|
|
req: &HeartbeatRequest,
|
|
user_id: i32,
|
|
machine_id: uuid::Uuid,
|
|
should_apply_runtime_revision: bool,
|
|
failed_instance_ids: &HashSet<String>,
|
|
) -> RoundStatus<HashSet<String>> {
|
|
// Both sources must agree on which instances are running: instances
|
|
// known to have failed are excluded so the reconciler restarts them
|
|
// instead of hot-patching a stopped instance forever.
|
|
let ids = if !should_apply_runtime_revision {
|
|
req.running_network_instances
|
|
.iter()
|
|
.map(|x| x.to_string())
|
|
.collect::<HashSet<_>>()
|
|
} else {
|
|
match rpc_client
|
|
.list_network_instance(BaseController::default(), ListNetworkInstanceRequest {})
|
|
.await
|
|
{
|
|
Ok(resp) => resp.inst_ids.iter().map(|x| x.to_string()).collect(),
|
|
Err(error) => {
|
|
tracing::warn!(
|
|
?user_id,
|
|
?machine_id,
|
|
?error,
|
|
"Failed to refresh running instances for managed config revision"
|
|
);
|
|
return RoundStatus::Skip;
|
|
}
|
|
}
|
|
};
|
|
RoundStatus::Ready(
|
|
ids.into_iter()
|
|
.filter(|id| !failed_instance_ids.contains(id))
|
|
.collect(),
|
|
)
|
|
}
|
|
|
|
async fn sync_running_sources_for_round(
|
|
rpc_client: &mut SessionRpcClient,
|
|
storage: &StorageInner,
|
|
round: &mut ReconcileRound,
|
|
) -> RoundStatus<Option<Vec<NetworkMeta>>> {
|
|
if !round.req.support_config_source {
|
|
return RoundStatus::Ready(None);
|
|
}
|
|
|
|
let ret = if round.running_inst_ids.is_empty() {
|
|
Ok(Vec::new())
|
|
} else {
|
|
rpc_client
|
|
.list_network_instance_meta(
|
|
BaseController::default(),
|
|
ListNetworkInstanceMetaRequest {
|
|
inst_ids: managed_config::parse_instance_ids(
|
|
round.running_inst_ids.iter().cloned(),
|
|
),
|
|
},
|
|
)
|
|
.await
|
|
.map(|resp| resp.metas)
|
|
};
|
|
|
|
match ret {
|
|
Ok(metas) => {
|
|
if let Err(e) = managed_config::sync_running_config_sources(
|
|
&storage.db,
|
|
round.user_id,
|
|
round.machine_id,
|
|
&round.local_configs,
|
|
&metas,
|
|
)
|
|
.await
|
|
{
|
|
tracing::warn!(
|
|
user_id = ?round.user_id,
|
|
machine_id = ?round.machine_id,
|
|
%e,
|
|
"Failed to sync running network config sources"
|
|
);
|
|
} else if !metas.is_empty() && matches!(round.scope, ReconcileScope::Full) {
|
|
round.local_configs = match storage
|
|
.db
|
|
.list_network_configs(
|
|
(round.user_id, round.machine_id),
|
|
ListNetworkProps::EnabledOnly,
|
|
)
|
|
.await
|
|
{
|
|
Ok(configs) => configs,
|
|
Err(e) => {
|
|
tracing::error!(
|
|
"Failed to reload network configs after source sync, error: {:?}",
|
|
e
|
|
);
|
|
return RoundStatus::Skip;
|
|
}
|
|
};
|
|
}
|
|
RoundStatus::Ready(Some(metas))
|
|
}
|
|
Err(e) => {
|
|
tracing::warn!(
|
|
user_id = ?round.user_id,
|
|
%e,
|
|
"Failed to list running network instance metadata"
|
|
);
|
|
RoundStatus::Ready(None)
|
|
}
|
|
}
|
|
}
|
|
|
|
async fn cleanup_stale_web_source_instances(
|
|
context: &ReconcileRoundContext<'_>,
|
|
storage: &StorageInner,
|
|
rpc_client: &mut SessionRpcClient,
|
|
running_metas: Option<&[NetworkMeta]>,
|
|
desired_web_inst_ids: &HashSet<String>,
|
|
cache: &mut ReconcileCache,
|
|
mutation_fence: &mut RuntimeMutationFence,
|
|
) -> RoundStatus<ReconcileOutcome> {
|
|
let session_data = context.session_data;
|
|
let round = context.round;
|
|
let desired_changed = cache
|
|
.last_desired_web_inst_ids
|
|
.as_ref()
|
|
.is_none_or(|last| last != desired_web_inst_ids);
|
|
if cache.cleaned_web_source_instances && !desired_changed {
|
|
return RoundStatus::Ready(ReconcileOutcome::default());
|
|
}
|
|
|
|
let db_web_inst_ids = match storage
|
|
.db
|
|
.list_network_configs((round.user_id, round.machine_id), ListNetworkProps::All)
|
|
.await
|
|
{
|
|
Ok(configs) => managed_config::desired_web_source_instance_ids(&configs),
|
|
Err(e) => {
|
|
tracing::error!("Failed to list all network configs, error: {:?}", e);
|
|
return RoundStatus::Skip;
|
|
}
|
|
};
|
|
|
|
let running_web_inst_ids = managed_config::running_web_source_instance_ids(
|
|
&round.running_inst_ids,
|
|
&db_web_inst_ids,
|
|
running_metas,
|
|
);
|
|
let should_delete_inst_ids = running_web_inst_ids
|
|
.difference(desired_web_inst_ids)
|
|
.cloned()
|
|
.collect::<HashSet<_>>();
|
|
let should_delete_ids =
|
|
managed_config::parse_instance_ids(should_delete_inst_ids.iter().cloned());
|
|
|
|
let mut outcome = ReconcileOutcome::default();
|
|
if !should_delete_ids.is_empty() {
|
|
if !begin_managed_runtime_mutation(session_data, round, mutation_fence).await {
|
|
tracing::debug!(
|
|
machine_id = ?round.machine_id,
|
|
"skip stale cleanup because the managed runtime fence is no longer current"
|
|
);
|
|
return RoundStatus::Skip;
|
|
}
|
|
let operation_started_at = std::time::Instant::now();
|
|
let ret = rpc_client
|
|
.delete_network_instance(
|
|
BaseController::default(),
|
|
DeleteNetworkInstanceRequest {
|
|
inst_ids: should_delete_ids,
|
|
},
|
|
)
|
|
.await;
|
|
tracing::info!(
|
|
user_id = ?round.user_id,
|
|
machine_id = ?round.machine_id,
|
|
elapsed_ms = operation_started_at.elapsed().as_millis(),
|
|
"Clean stale web-source network instances on heartbeat: {:?}",
|
|
ret
|
|
);
|
|
match ret {
|
|
Err(_) => outcome.record_failure(true),
|
|
Ok(response) => {
|
|
let undeleted_instance_ids =
|
|
retained_requested_instance_ids(response, &should_delete_inst_ids);
|
|
if undeleted_instance_ids.is_empty() {
|
|
cache.runtime_configs.forget_many(&should_delete_inst_ids);
|
|
} else {
|
|
tracing::warn!(
|
|
user_id = ?round.user_id,
|
|
machine_id = ?round.machine_id,
|
|
instance_ids = ?undeleted_instance_ids,
|
|
"Stale managed instances were retained by the runtime"
|
|
);
|
|
outcome.record_failure(true);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if !outcome.has_failed {
|
|
cache.cleaned_web_source_instances = true;
|
|
cache.last_desired_web_inst_ids = Some(desired_web_inst_ids.clone());
|
|
}
|
|
|
|
RoundStatus::Ready(outcome)
|
|
}
|
|
|
|
async fn cleanup_patch_deleted_instances(
|
|
session_data: &std::sync::Weak<RwLock<SessionData>>,
|
|
rpc_client: &mut SessionRpcClient,
|
|
round: &ReconcileRound,
|
|
running_metas: Option<&[NetworkMeta]>,
|
|
delete_instance_ids: &HashSet<String>,
|
|
cache: &mut ReconcileCache,
|
|
mutation_fence: &mut RuntimeMutationFence,
|
|
) -> RoundStatus<ReconcileOutcome> {
|
|
let running_web_instance_ids: HashSet<String> = match running_metas {
|
|
Some(metas) => managed_config::running_web_source_instance_ids(
|
|
&round.running_inst_ids,
|
|
delete_instance_ids,
|
|
Some(metas),
|
|
)
|
|
.intersection(delete_instance_ids)
|
|
.cloned()
|
|
.collect(),
|
|
None => round
|
|
.running_inst_ids
|
|
.intersection(delete_instance_ids)
|
|
.cloned()
|
|
.collect(),
|
|
};
|
|
if running_web_instance_ids.is_empty() {
|
|
cache
|
|
.runtime_configs
|
|
.forget_many(delete_instance_ids.iter());
|
|
return RoundStatus::Ready(ReconcileOutcome::default());
|
|
}
|
|
if !begin_managed_runtime_mutation(session_data, round, mutation_fence).await {
|
|
tracing::debug!(
|
|
machine_id = ?round.machine_id,
|
|
"skip managed config Patch cleanup because the runtime fence is no longer current"
|
|
);
|
|
return RoundStatus::Skip;
|
|
}
|
|
|
|
let operation_started_at = std::time::Instant::now();
|
|
let ret = rpc_client
|
|
.delete_network_instance(
|
|
BaseController::default(),
|
|
DeleteNetworkInstanceRequest {
|
|
inst_ids: managed_config::parse_instance_ids(
|
|
running_web_instance_ids.iter().cloned(),
|
|
),
|
|
},
|
|
)
|
|
.await;
|
|
tracing::info!(
|
|
user_id = ?round.user_id,
|
|
machine_id = ?round.machine_id,
|
|
elapsed_ms = operation_started_at.elapsed().as_millis(),
|
|
deleted_instance_ids = ?running_web_instance_ids,
|
|
"Apply managed config Patch deletions at runtime: {:?}",
|
|
ret
|
|
);
|
|
|
|
let mut outcome = ReconcileOutcome::default();
|
|
match ret {
|
|
Err(_) => outcome.record_failure(true),
|
|
Ok(response) => {
|
|
let undeleted_instance_ids =
|
|
retained_requested_instance_ids(response, &running_web_instance_ids);
|
|
if undeleted_instance_ids.is_empty() {
|
|
cache
|
|
.runtime_configs
|
|
.forget_many(delete_instance_ids.iter());
|
|
} else {
|
|
tracing::warn!(
|
|
user_id = ?round.user_id,
|
|
machine_id = ?round.machine_id,
|
|
instance_ids = ?undeleted_instance_ids,
|
|
"Managed config Patch deletion was retained by the runtime"
|
|
);
|
|
outcome.record_failure(true);
|
|
}
|
|
}
|
|
}
|
|
RoundStatus::Ready(outcome)
|
|
}
|
|
|
|
async fn begin_managed_runtime_mutation(
|
|
session_data: &std::sync::Weak<RwLock<SessionData>>,
|
|
round: &ReconcileRound,
|
|
mutation_fence: &mut RuntimeMutationFence,
|
|
) -> bool {
|
|
let Some(data) = session_data.upgrade() else {
|
|
return false;
|
|
};
|
|
let data = data.write().await;
|
|
if !SessionRpcService::runtime_heartbeat_is_current_locked(&data, &round.req) {
|
|
return false;
|
|
}
|
|
let managed_runtime = data.managed_runtime.clone();
|
|
let mut runtime = managed_runtime
|
|
.lock()
|
|
.expect("managed runtime state lock poisoned");
|
|
if runtime.runtime_config_epoch != round.runtime_config_epoch {
|
|
return false;
|
|
}
|
|
if !mutation_fence.started {
|
|
runtime.applied_config_revision = None;
|
|
runtime.applied_config_revision_known = true;
|
|
if matches!(round.scope, ReconcileScope::Full) {
|
|
runtime.known_runtime_base_revision = None;
|
|
}
|
|
mutation_fence.started = true;
|
|
}
|
|
true
|
|
}
|
|
|
|
fn retained_requested_instance_ids(
|
|
response: DeleteNetworkInstanceResponse,
|
|
requested_instance_ids: &HashSet<String>,
|
|
) -> HashSet<String> {
|
|
response
|
|
.remain_inst_ids
|
|
.into_iter()
|
|
.map(|instance_id| uuid::Uuid::from(instance_id).to_string())
|
|
.filter(|instance_id| requested_instance_ids.contains(instance_id))
|
|
.collect()
|
|
}
|
|
|
|
fn should_reconcile_running_web_config(
|
|
is_running: bool,
|
|
source: PersistedConfigSource,
|
|
round: &ReconcileRound,
|
|
) -> bool {
|
|
is_running
|
|
&& source == PersistedConfigSource::Web
|
|
// Legacy consoles update web configs without a revision. With no
|
|
// revision to compare against, running web configs are checked
|
|
// every round so unrevisioned changes still converge.
|
|
&& (round.should_apply_runtime_revision || round.target_config_revision.is_none())
|
|
}
|
|
|
|
async fn reconcile_desired_runtime_configs(
|
|
context: &ReconcileRoundContext<'_>,
|
|
rpc_client: &mut SessionRpcClient,
|
|
config_client: &mut SessionConfigClient,
|
|
cache: &mut ReconcileCache,
|
|
mutation_fence: &mut RuntimeMutationFence,
|
|
) -> ReconcileOutcome {
|
|
let session_data = context.session_data;
|
|
let round = context.round;
|
|
let mut outcome = ReconcileOutcome::default();
|
|
|
|
// After stale web-owned instances are removed, start every enabled
|
|
// config that the latest heartbeat did not report as running. When
|
|
// a managed config revision is pending, also reconcile running
|
|
// web-owned configs before reporting that revision as applied.
|
|
for config in &round.local_configs {
|
|
let source = PersistedConfigSource::from_db(&config.source);
|
|
let is_running = round.running_inst_ids.contains(&config.network_instance_id);
|
|
let should_reconcile_running_web_config =
|
|
should_reconcile_running_web_config(is_running, source, round);
|
|
if is_running && !should_reconcile_running_web_config {
|
|
continue;
|
|
}
|
|
|
|
let desired_config = match serde_json::from_str::<NetworkConfig>(&config.network_config) {
|
|
Ok(cfg) => cfg,
|
|
Err(e) => {
|
|
tracing::error!(
|
|
user_id = ?round.user_id,
|
|
machine_id = ?round.machine_id,
|
|
instance_id = %config.network_instance_id,
|
|
"Failed to deserialize network config, skipping: {:?}",
|
|
e
|
|
);
|
|
if source == PersistedConfigSource::Web {
|
|
cache.runtime_configs.forget(&config.network_instance_id);
|
|
}
|
|
outcome.record_failure(source == PersistedConfigSource::Web);
|
|
continue;
|
|
}
|
|
};
|
|
|
|
let action_result = if should_reconcile_running_web_config {
|
|
reconcile_running_web_config(
|
|
context,
|
|
rpc_client,
|
|
config_client,
|
|
config,
|
|
desired_config,
|
|
&mut cache.runtime_configs,
|
|
mutation_fence,
|
|
)
|
|
.await
|
|
} else {
|
|
if source == PersistedConfigSource::Web {
|
|
cache.runtime_configs.forget(&config.network_instance_id);
|
|
}
|
|
let action_result = run_missing_network_config(
|
|
session_data,
|
|
rpc_client,
|
|
round,
|
|
config,
|
|
desired_config.clone(),
|
|
mutation_fence,
|
|
)
|
|
.await;
|
|
if matches!(action_result, ConfigActionResult::Success)
|
|
&& source == PersistedConfigSource::Web
|
|
{
|
|
if let Err(e) = remember_web_runtime_config_after_run(
|
|
rpc_client,
|
|
&config.network_instance_id,
|
|
&desired_config,
|
|
&mut cache.runtime_configs,
|
|
)
|
|
.await
|
|
{
|
|
tracing::error!(
|
|
user_id = ?round.user_id,
|
|
machine_id = ?round.machine_id,
|
|
instance_id = %config.network_instance_id,
|
|
"Failed to cache runtime config after run: {:?}",
|
|
e
|
|
);
|
|
ConfigActionResult::Failed
|
|
} else {
|
|
action_result
|
|
}
|
|
} else {
|
|
action_result
|
|
}
|
|
};
|
|
|
|
match action_result {
|
|
ConfigActionResult::Success => {}
|
|
ConfigActionResult::Failed => {
|
|
if source == PersistedConfigSource::Web {
|
|
cache.runtime_configs.forget(&config.network_instance_id);
|
|
}
|
|
outcome.record_failure(source == PersistedConfigSource::Web)
|
|
}
|
|
ConfigActionResult::StopRound => {
|
|
if source == PersistedConfigSource::Web {
|
|
cache.runtime_configs.forget(&config.network_instance_id);
|
|
}
|
|
outcome.record_failure(source == PersistedConfigSource::Web);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
outcome
|
|
}
|
|
|
|
async fn reconcile_running_web_config(
|
|
context: &ReconcileRoundContext<'_>,
|
|
rpc_client: &mut SessionRpcClient,
|
|
config_client: &mut SessionConfigClient,
|
|
config: &crate::db::entity::user_running_network_configs::Model,
|
|
desired_config: NetworkConfig,
|
|
runtime_config_cache: &mut SessionRuntimeConfigCache,
|
|
mutation_fence: &mut RuntimeMutationFence,
|
|
) -> ConfigActionResult {
|
|
let session_data = context.session_data;
|
|
let round = context.round;
|
|
if !SessionRpcService::runtime_heartbeat_is_current(session_data, &round.req).await {
|
|
tracing::debug!(
|
|
machine_id = ?round.machine_id,
|
|
instance_id = %config.network_instance_id,
|
|
"skip runtime reconcile because webhook session is no longer current"
|
|
);
|
|
return ConfigActionResult::StopRound;
|
|
}
|
|
|
|
let operation_started_at = std::time::Instant::now();
|
|
let ret = async {
|
|
let action =
|
|
match runtime_config_cache.plan(&config.network_instance_id, desired_config.clone())? {
|
|
Some(action) => action,
|
|
None => {
|
|
runtime_reconcile::prepare_web_source_runtime_reconcile(
|
|
&mut *rpc_client,
|
|
&config.network_instance_id,
|
|
desired_config.clone(),
|
|
true,
|
|
)
|
|
.await?
|
|
}
|
|
};
|
|
if !SessionRpcService::runtime_heartbeat_is_current(session_data, &round.req).await {
|
|
anyhow::bail!("webhook session is no longer current before runtime reconcile apply");
|
|
}
|
|
if !matches!(
|
|
action,
|
|
runtime_reconcile::RuntimeReconcileAction::Unchanged(_)
|
|
) && !begin_managed_runtime_mutation(session_data, round, mutation_fence).await
|
|
{
|
|
anyhow::bail!("managed runtime mutation fence is no longer current");
|
|
}
|
|
let observed_config = runtime_reconcile::apply_web_source_runtime_reconcile(
|
|
&mut *rpc_client,
|
|
&mut *config_client,
|
|
&config.network_instance_id,
|
|
desired_config.clone(),
|
|
action,
|
|
)
|
|
.await?;
|
|
runtime_config_cache.remember(&config.network_instance_id, observed_config);
|
|
Ok::<(), anyhow::Error>(())
|
|
}
|
|
.await;
|
|
tracing::info!(
|
|
user_id = ?round.user_id,
|
|
machine_id = ?round.machine_id,
|
|
instance_id = %config.network_instance_id,
|
|
elapsed_ms = operation_started_at.elapsed().as_millis(),
|
|
"Reconcile running web-source network instance: {:?}",
|
|
ret
|
|
);
|
|
|
|
if ret.is_ok() {
|
|
ConfigActionResult::Success
|
|
} else {
|
|
runtime_config_cache.forget(&config.network_instance_id);
|
|
ConfigActionResult::Failed
|
|
}
|
|
}
|
|
|
|
async fn run_missing_network_config(
|
|
session_data: &std::sync::Weak<RwLock<SessionData>>,
|
|
rpc_client: &mut SessionRpcClient,
|
|
round: &ReconcileRound,
|
|
config: &crate::db::entity::user_running_network_configs::Model,
|
|
desired_config: NetworkConfig,
|
|
mutation_fence: &mut RuntimeMutationFence,
|
|
) -> ConfigActionResult {
|
|
if !SessionRpcService::runtime_heartbeat_is_current(session_data, &round.req).await {
|
|
tracing::debug!(
|
|
machine_id = ?round.machine_id,
|
|
instance_id = %config.network_instance_id,
|
|
"skip run network instance because webhook session is no longer current"
|
|
);
|
|
return ConfigActionResult::StopRound;
|
|
}
|
|
|
|
let source = PersistedConfigSource::from_db(&config.source);
|
|
if source == PersistedConfigSource::Web
|
|
&& !begin_managed_runtime_mutation(session_data, round, mutation_fence).await
|
|
{
|
|
tracing::debug!(
|
|
machine_id = ?round.machine_id,
|
|
instance_id = %config.network_instance_id,
|
|
"skip run network instance because the managed runtime fence is no longer current"
|
|
);
|
|
return ConfigActionResult::StopRound;
|
|
}
|
|
|
|
let operation_started_at = std::time::Instant::now();
|
|
let ret = rpc_client
|
|
.run_network_instance(
|
|
BaseController::default(),
|
|
RunNetworkInstanceRequest {
|
|
inst_id: Some(config.network_instance_id.clone().into()),
|
|
config: Some(desired_config),
|
|
overwrite: false,
|
|
source: source.auto_run_rpc_source() as i32,
|
|
},
|
|
)
|
|
.await;
|
|
tracing::info!(
|
|
user_id = ?round.user_id,
|
|
machine_id = ?round.machine_id,
|
|
instance_id = %config.network_instance_id,
|
|
elapsed_ms = operation_started_at.elapsed().as_millis(),
|
|
"Run network instance: {:?}",
|
|
ret
|
|
);
|
|
|
|
let action_result = if ret.is_ok() {
|
|
ConfigActionResult::Success
|
|
} else {
|
|
ConfigActionResult::Failed
|
|
};
|
|
if source == PersistedConfigSource::Web {
|
|
record_direct_run_result(
|
|
session_data,
|
|
round,
|
|
&config.network_instance_id,
|
|
matches!(action_result, ConfigActionResult::Failed),
|
|
)
|
|
.await;
|
|
}
|
|
action_result
|
|
}
|
|
|
|
async fn record_direct_run_result(
|
|
session_data: &std::sync::Weak<RwLock<SessionData>>,
|
|
round: &ReconcileRound,
|
|
instance_id: &str,
|
|
failed: bool,
|
|
) {
|
|
let _ = update_direct_run_failures_if_current(session_data, round, |data| {
|
|
SessionRpcService::update_direct_run_failure_locked(data, instance_id, failed)
|
|
})
|
|
.await;
|
|
}
|
|
|
|
async fn remember_web_runtime_config_after_run(
|
|
rpc_client: &mut SessionRpcClient,
|
|
inst_id: &str,
|
|
desired_config: &NetworkConfig,
|
|
runtime_config_cache: &mut SessionRuntimeConfigCache,
|
|
) -> anyhow::Result<()> {
|
|
let observed_config = runtime_reconcile::get_runtime_config(rpc_client, inst_id).await?;
|
|
remember_if_runtime_matches_desired(
|
|
inst_id,
|
|
desired_config,
|
|
observed_config,
|
|
runtime_config_cache,
|
|
)
|
|
}
|
|
|
|
fn remember_if_runtime_matches_desired(
|
|
inst_id: &str,
|
|
desired_config: &NetworkConfig,
|
|
observed_config: NetworkConfig,
|
|
runtime_config_cache: &mut SessionRuntimeConfigCache,
|
|
) -> anyhow::Result<()> {
|
|
let action = runtime_reconcile::prepare_web_source_runtime_reconcile_from_current(
|
|
&observed_config,
|
|
desired_config.clone(),
|
|
)?;
|
|
if !matches!(
|
|
action,
|
|
runtime_reconcile::RuntimeReconcileAction::Unchanged(_)
|
|
) {
|
|
anyhow::bail!("runtime config still differs after managed run");
|
|
}
|
|
runtime_config_cache.remember(inst_id, observed_config);
|
|
Ok(())
|
|
}
|
|
|
|
async fn mark_config_revision_applied_if_current(
|
|
session_data: &std::sync::Weak<RwLock<SessionData>>,
|
|
storage: &StorageInner,
|
|
round: &ReconcileRound,
|
|
outcome: &ReconcileOutcome,
|
|
mutation_fence: &RuntimeMutationFence,
|
|
) -> RoundStatus<()> {
|
|
if outcome.managed_revision_failed
|
|
|| (!round.should_apply_runtime_revision && !mutation_fence.started)
|
|
{
|
|
return RoundStatus::Ready(());
|
|
}
|
|
|
|
let current_target_config_revision =
|
|
match read_managed_config_revision(storage, round.user_id, round.machine_id).await {
|
|
RoundStatus::Ready(revision) => revision,
|
|
RoundStatus::Skip => return RoundStatus::Skip,
|
|
RoundStatus::Stop => return RoundStatus::Stop,
|
|
};
|
|
if current_target_config_revision != round.target_config_revision {
|
|
return RoundStatus::Ready(());
|
|
}
|
|
let Some(data) = session_data.upgrade() else {
|
|
return RoundStatus::Stop;
|
|
};
|
|
let notify = {
|
|
let mut data = data.write().await;
|
|
if !SessionRpcService::runtime_heartbeat_is_current_locked(&data, &round.req) {
|
|
return RoundStatus::Ready(());
|
|
}
|
|
record_applied_config_revision(
|
|
&mut data,
|
|
Some(round.runtime_config_epoch),
|
|
round.target_config_revision.clone(),
|
|
)
|
|
};
|
|
if let Some(notify) = notify {
|
|
notify.notify_one();
|
|
}
|
|
|
|
RoundStatus::Ready(())
|
|
}
|
|
|
|
fn record_applied_config_revision(
|
|
data: &mut SessionData,
|
|
expected_runtime_config_epoch: Option<u64>,
|
|
revision: Option<String>,
|
|
) -> Option<std::sync::Arc<tokio::sync::Notify>> {
|
|
let managed_runtime = data.managed_runtime.clone();
|
|
let mut runtime = managed_runtime
|
|
.lock()
|
|
.expect("managed runtime state lock poisoned");
|
|
if expected_runtime_config_epoch
|
|
.is_some_and(|expected| runtime.runtime_config_epoch != expected)
|
|
{
|
|
return None;
|
|
}
|
|
let changed =
|
|
!runtime.applied_config_revision_known || runtime.applied_config_revision != revision;
|
|
if changed {
|
|
tracing::info!(
|
|
machine_id = ?data.req.as_ref().and_then(|req| req.machine_id),
|
|
previous_revision = ?runtime.applied_config_revision,
|
|
applied_revision = ?revision,
|
|
"managed config revision applied"
|
|
);
|
|
}
|
|
runtime.known_runtime_base_revision = revision.clone();
|
|
runtime.applied_config_revision = revision;
|
|
runtime.applied_config_revision_known = true;
|
|
runtime.pending_managed_config_reconcile = None;
|
|
drop(runtime);
|
|
changed.then(|| SessionRpcService::mark_webhook_validation_state_changed_locked(data))
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use easytier::proto::api::manage::{NetworkingMethod, PortForwardConfig};
|
|
|
|
use super::*;
|
|
|
|
fn config_with_port_forwards(port_forwards: Vec<PortForwardConfig>) -> NetworkConfig {
|
|
NetworkConfig {
|
|
instance_id: Some("11111111-1111-1111-1111-111111111111".to_string()),
|
|
dhcp: Some(true),
|
|
network_name: Some("managed".to_string()),
|
|
network_secret: Some("secret".to_string()),
|
|
networking_method: Some(NetworkingMethod::Manual as i32),
|
|
port_forwards,
|
|
..Default::default()
|
|
}
|
|
}
|
|
|
|
fn port_forward(bind_port: u32, dst_port: u32) -> PortForwardConfig {
|
|
PortForwardConfig {
|
|
bind_ip: "127.0.0.1".to_string(),
|
|
bind_port,
|
|
dst_ip: "10.144.0.1".to_string(),
|
|
dst_port,
|
|
proto: "tcp".to_string(),
|
|
}
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn full_and_patch_deletes_cleanup_direct_run_failures() {
|
|
let storage =
|
|
crate::client_manager::storage::Storage::new(crate::db::Db::memory_db().await);
|
|
let mut data = SessionData::new(
|
|
storage.weak_ref(),
|
|
url::Url::parse("http://127.0.0.1").unwrap(),
|
|
None,
|
|
std::sync::Arc::new(crate::FeatureFlags::default()),
|
|
std::sync::Arc::new(crate::webhook::WebhookConfig::new(
|
|
None, None, None, None, None,
|
|
)),
|
|
);
|
|
let retained = uuid::Uuid::new_v4().to_string();
|
|
let removed_by_full = uuid::Uuid::new_v4().to_string();
|
|
let removed_by_patch = uuid::Uuid::new_v4().to_string();
|
|
data.direct_run_failed_instance_ids =
|
|
HashSet::from([retained.clone(), removed_by_full, removed_by_patch.clone()]);
|
|
|
|
SessionRpcService::retain_direct_run_failures_locked(
|
|
&mut data,
|
|
&HashSet::from([retained.clone(), removed_by_patch.clone()]),
|
|
);
|
|
assert_eq!(
|
|
data.direct_run_failed_instance_ids,
|
|
HashSet::from([retained.clone(), removed_by_patch.clone()])
|
|
);
|
|
|
|
SessionRpcService::remove_direct_run_failures_locked(
|
|
&mut data,
|
|
&HashSet::from([removed_by_patch]),
|
|
);
|
|
assert_eq!(
|
|
data.direct_run_failed_instance_ids,
|
|
HashSet::from([retained])
|
|
);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn managed_revision_read_failure_retries_on_a_later_round() {
|
|
let storage =
|
|
crate::client_manager::storage::Storage::new(crate::db::Db::memory_db().await);
|
|
let user_id = storage.db().auto_create_user("token").await.unwrap().id;
|
|
let machine_id = uuid::Uuid::new_v4();
|
|
let pool = storage.db().inner();
|
|
sqlx::query("DROP TABLE managed_config_revisions")
|
|
.execute(&pool)
|
|
.await
|
|
.unwrap();
|
|
let storage_inner = storage.weak_ref().upgrade().unwrap();
|
|
|
|
assert!(matches!(
|
|
read_managed_config_revision(&storage_inner, user_id, machine_id).await,
|
|
RoundStatus::Skip
|
|
));
|
|
|
|
sqlx::query(
|
|
r#"
|
|
CREATE TABLE managed_config_revisions (
|
|
id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
|
|
user_id INTEGER NOT NULL,
|
|
device_id TEXT NOT NULL,
|
|
config_revision TEXT NOT NULL,
|
|
create_time TEXT NOT NULL,
|
|
update_time TEXT NOT NULL,
|
|
CONSTRAINT fk_managed_config_revisions_user_id_to_users_id
|
|
FOREIGN KEY (user_id) REFERENCES users(id)
|
|
ON DELETE CASCADE
|
|
ON UPDATE CASCADE
|
|
)
|
|
"#,
|
|
)
|
|
.execute(&pool)
|
|
.await
|
|
.unwrap();
|
|
sqlx::query(
|
|
"CREATE UNIQUE INDEX idx_managed_config_revisions_scope \
|
|
ON managed_config_revisions(user_id, device_id)",
|
|
)
|
|
.execute(&pool)
|
|
.await
|
|
.unwrap();
|
|
storage
|
|
.db()
|
|
.set_managed_config_revision((user_id, machine_id), "rev-recovered")
|
|
.await
|
|
.unwrap();
|
|
|
|
assert!(matches!(
|
|
read_managed_config_revision(&storage_inner, user_id, machine_id).await,
|
|
RoundStatus::Ready(Some(revision)) if revision == "rev-recovered"
|
|
));
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn newly_applied_revision_wakes_webhook_validation() {
|
|
let storage =
|
|
crate::client_manager::storage::Storage::new(crate::db::Db::memory_db().await);
|
|
let mut data = SessionData::new(
|
|
storage.weak_ref(),
|
|
url::Url::parse("http://127.0.0.1").unwrap(),
|
|
None,
|
|
std::sync::Arc::new(crate::FeatureFlags::default()),
|
|
std::sync::Arc::new(crate::webhook::WebhookConfig::new(
|
|
None, None, None, None, None,
|
|
)),
|
|
);
|
|
data.managed_runtime().pending_managed_config_reconcile =
|
|
Some(ManagedConfigReconcileHint::Dirty {
|
|
expected_revision: "rev-a".to_string(),
|
|
target_revision: "rev-b".to_string(),
|
|
instance_ids: HashSet::from(["managed".to_string()]),
|
|
});
|
|
|
|
let notify =
|
|
record_applied_config_revision(&mut data, None, Some("rev-applied".to_string()))
|
|
.expect("new applied revision should wake validation");
|
|
{
|
|
let runtime = data.managed_runtime();
|
|
assert_eq!(
|
|
runtime.applied_config_revision.as_deref(),
|
|
Some("rev-applied")
|
|
);
|
|
assert!(runtime.applied_config_revision_known);
|
|
assert_eq!(
|
|
runtime.known_runtime_base_revision.as_deref(),
|
|
Some("rev-applied")
|
|
);
|
|
assert_eq!(runtime.pending_managed_config_reconcile, None);
|
|
}
|
|
assert!(data.webhook_validation_dirty);
|
|
assert_eq!(data.webhook_validation_change_epoch, 1);
|
|
|
|
notify.notify_one();
|
|
tokio::time::timeout(std::time::Duration::from_millis(100), notify.notified())
|
|
.await
|
|
.expect("validation worker was not notified");
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn unchanged_applied_revision_does_not_add_validation_work() {
|
|
let storage =
|
|
crate::client_manager::storage::Storage::new(crate::db::Db::memory_db().await);
|
|
let mut data = SessionData::new(
|
|
storage.weak_ref(),
|
|
url::Url::parse("http://127.0.0.1").unwrap(),
|
|
None,
|
|
std::sync::Arc::new(crate::FeatureFlags::default()),
|
|
std::sync::Arc::new(crate::webhook::WebhookConfig::new(
|
|
None, None, None, None, None,
|
|
)),
|
|
);
|
|
{
|
|
let mut runtime = data.managed_runtime();
|
|
runtime.applied_config_revision = Some("rev-applied".to_string());
|
|
runtime.applied_config_revision_known = true;
|
|
}
|
|
|
|
assert!(
|
|
record_applied_config_revision(&mut data, None, Some("rev-applied".to_string()))
|
|
.is_none()
|
|
);
|
|
assert_eq!(
|
|
data.managed_runtime()
|
|
.known_runtime_base_revision
|
|
.as_deref(),
|
|
Some("rev-applied")
|
|
);
|
|
assert!(!data.webhook_validation_dirty);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn stale_round_cannot_record_applied_revision() {
|
|
let storage =
|
|
crate::client_manager::storage::Storage::new(crate::db::Db::memory_db().await);
|
|
let mut data = SessionData::new(
|
|
storage.weak_ref(),
|
|
url::Url::parse("http://127.0.0.1").unwrap(),
|
|
None,
|
|
std::sync::Arc::new(crate::FeatureFlags::default()),
|
|
std::sync::Arc::new(crate::webhook::WebhookConfig::new(
|
|
None, None, None, None, None,
|
|
)),
|
|
);
|
|
{
|
|
let mut runtime = data.managed_runtime();
|
|
runtime.applied_config_revision = Some("rev-a".to_string());
|
|
runtime.applied_config_revision_known = true;
|
|
runtime.runtime_config_epoch = 2;
|
|
}
|
|
|
|
assert!(
|
|
record_applied_config_revision(&mut data, Some(1), Some("rev-b".to_string())).is_none()
|
|
);
|
|
let runtime = data.managed_runtime();
|
|
assert_eq!(runtime.applied_config_revision.as_deref(), Some("rev-a"));
|
|
assert_eq!(runtime.runtime_config_epoch, 2);
|
|
}
|
|
|
|
#[test]
|
|
fn patch_delete_requires_runtime_to_remove_every_requested_instance() {
|
|
let deleted_id = uuid::Uuid::new_v4();
|
|
let requested = HashSet::from([deleted_id.to_string()]);
|
|
|
|
assert_eq!(
|
|
retained_requested_instance_ids(
|
|
DeleteNetworkInstanceResponse {
|
|
remain_inst_ids: vec![deleted_id.into()],
|
|
},
|
|
&requested,
|
|
),
|
|
requested
|
|
);
|
|
assert!(
|
|
retained_requested_instance_ids(
|
|
DeleteNetworkInstanceResponse {
|
|
remain_inst_ids: Vec::new(),
|
|
},
|
|
&requested,
|
|
)
|
|
.is_empty()
|
|
);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn managed_runtime_mutation_preserves_base_only_for_patch_scope() {
|
|
let machine_id = uuid::Uuid::new_v4();
|
|
let req = HeartbeatRequest {
|
|
user_token: "token".to_string(),
|
|
machine_id: Some(machine_id.into()),
|
|
..Default::default()
|
|
};
|
|
let storage =
|
|
crate::client_manager::storage::Storage::new(crate::db::Db::memory_db().await);
|
|
let client_url = url::Url::parse("http://127.0.0.1").unwrap();
|
|
let mut data = SessionData::new(
|
|
storage.weak_ref(),
|
|
client_url.clone(),
|
|
None,
|
|
std::sync::Arc::new(crate::FeatureFlags::default()),
|
|
std::sync::Arc::new(crate::webhook::WebhookConfig::new(
|
|
None, None, None, None, None,
|
|
)),
|
|
);
|
|
let storage_token = crate::client_manager::storage::StorageToken {
|
|
token: req.user_token.clone(),
|
|
client_url,
|
|
machine_id,
|
|
user_id: 7,
|
|
};
|
|
storage.update_session_client(storage_token.clone(), 1, true, 0);
|
|
data.storage_token = Some(storage_token);
|
|
data.req = Some(req.clone());
|
|
data.auth_state = super::super::SessionAuthState::Authorized;
|
|
{
|
|
let mut runtime = data.managed_runtime();
|
|
runtime.applied_config_revision = Some("rev-a".to_string());
|
|
runtime.known_runtime_base_revision = Some("rev-a".to_string());
|
|
runtime.pending_managed_config_reconcile = Some(ManagedConfigReconcileHint::Dirty {
|
|
expected_revision: "rev-a".to_string(),
|
|
target_revision: "rev-b".to_string(),
|
|
instance_ids: HashSet::from(["managed".to_string()]),
|
|
});
|
|
runtime.runtime_config_epoch = 11;
|
|
}
|
|
let session_data = std::sync::Arc::new(RwLock::new(data));
|
|
let mut round = ReconcileRound {
|
|
req,
|
|
machine_id,
|
|
user_id: 7,
|
|
running_inst_ids: HashSet::new(),
|
|
local_configs: Vec::new(),
|
|
delete_instance_ids: HashSet::new(),
|
|
target_config_revision: Some("rev-b".to_string()),
|
|
should_apply_runtime_revision: true,
|
|
scope: ReconcileScope::Patch {
|
|
dirty_instance_ids: HashSet::from(["managed".to_string()]),
|
|
},
|
|
runtime_config_epoch: 11,
|
|
runtime_config_cache_epoch: 0,
|
|
};
|
|
let mut mutation_fence = RuntimeMutationFence::default();
|
|
|
|
assert!(
|
|
begin_managed_runtime_mutation(
|
|
&std::sync::Arc::downgrade(&session_data),
|
|
&round,
|
|
&mut mutation_fence,
|
|
)
|
|
.await
|
|
);
|
|
|
|
{
|
|
let data = session_data.read().await;
|
|
let runtime = data.managed_runtime();
|
|
assert!(mutation_fence.started);
|
|
assert_eq!(runtime.applied_config_revision, None);
|
|
assert!(runtime.applied_config_revision_known);
|
|
assert_eq!(
|
|
runtime.known_runtime_base_revision.as_deref(),
|
|
Some("rev-a")
|
|
);
|
|
assert_eq!(
|
|
runtime.pending_managed_config_reconcile,
|
|
Some(ManagedConfigReconcileHint::Dirty {
|
|
expected_revision: "rev-a".to_string(),
|
|
target_revision: "rev-b".to_string(),
|
|
instance_ids: HashSet::from(["managed".to_string()]),
|
|
})
|
|
);
|
|
assert_eq!(runtime.runtime_config_epoch, 11);
|
|
assert_eq!(
|
|
select_reconcile_scope(
|
|
runtime.pending_managed_config_reconcile.as_ref(),
|
|
runtime.known_runtime_base_revision.as_deref(),
|
|
Some("rev-b"),
|
|
),
|
|
ReconcileScope::Patch {
|
|
dirty_instance_ids: HashSet::from(["managed".to_string()]),
|
|
}
|
|
);
|
|
}
|
|
|
|
{
|
|
let data = session_data.write().await;
|
|
data.managed_runtime().applied_config_revision = Some("rev-a".to_string());
|
|
}
|
|
round.scope = ReconcileScope::Full;
|
|
let mut mutation_fence = RuntimeMutationFence::default();
|
|
assert!(
|
|
begin_managed_runtime_mutation(
|
|
&std::sync::Arc::downgrade(&session_data),
|
|
&round,
|
|
&mut mutation_fence,
|
|
)
|
|
.await
|
|
);
|
|
|
|
{
|
|
let data = session_data.read().await;
|
|
let runtime = data.managed_runtime();
|
|
assert_eq!(runtime.applied_config_revision, None);
|
|
assert!(runtime.applied_config_revision_known);
|
|
assert_eq!(runtime.known_runtime_base_revision, None);
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn dirty_hint_without_known_runtime_base_uses_full_reconcile() {
|
|
assert_eq!(
|
|
select_reconcile_scope(
|
|
Some(&ManagedConfigReconcileHint::Dirty {
|
|
expected_revision: "rev-a".to_string(),
|
|
target_revision: "rev-b".to_string(),
|
|
instance_ids: HashSet::from(["upsert".to_string(), "delete".to_string(),]),
|
|
}),
|
|
None,
|
|
Some("rev-b"),
|
|
),
|
|
ReconcileScope::Full
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn matching_known_runtime_base_and_target_select_dirty_instances() {
|
|
assert_eq!(
|
|
select_reconcile_scope(
|
|
Some(&ManagedConfigReconcileHint::Dirty {
|
|
expected_revision: "rev-a".to_string(),
|
|
target_revision: "rev-b".to_string(),
|
|
instance_ids: HashSet::from(["upsert".to_string(), "delete".to_string(),]),
|
|
}),
|
|
Some("rev-a"),
|
|
Some("rev-b"),
|
|
),
|
|
ReconcileScope::Patch {
|
|
dirty_instance_ids: HashSet::from(["upsert".to_string(), "delete".to_string()]),
|
|
}
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn mismatched_known_runtime_base_uses_full_reconcile() {
|
|
let hint = ManagedConfigReconcileHint::Dirty {
|
|
expected_revision: "rev-b".to_string(),
|
|
target_revision: "rev-c".to_string(),
|
|
instance_ids: HashSet::from(["managed".to_string()]),
|
|
};
|
|
|
|
assert_eq!(
|
|
select_reconcile_scope(Some(&hint), Some("rev-a"), Some("rev-c")),
|
|
ReconcileScope::Full
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn missing_or_full_hint_uses_full_reconcile() {
|
|
assert_eq!(
|
|
select_reconcile_scope(
|
|
Some(&ManagedConfigReconcileHint::Full),
|
|
Some("rev-a"),
|
|
Some("rev-b"),
|
|
),
|
|
ReconcileScope::Full
|
|
);
|
|
assert_eq!(
|
|
select_reconcile_scope(None, Some("rev-a"), Some("rev-b")),
|
|
ReconcileScope::Full
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn dirty_hint_for_older_target_uses_full_reconcile() {
|
|
let hint = ManagedConfigReconcileHint::Dirty {
|
|
expected_revision: "rev-0".to_string(),
|
|
target_revision: "rev-a".to_string(),
|
|
instance_ids: HashSet::from(["managed".to_string()]),
|
|
};
|
|
|
|
assert_eq!(
|
|
select_reconcile_scope(Some(&hint), Some("rev-0"), Some("rev-b")),
|
|
ReconcileScope::Full
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn managed_revision_change_preserves_runtime_config_cache() {
|
|
let mut cache = ReconcileCache::default();
|
|
cache.runtime_configs.remember(
|
|
"managed",
|
|
config_with_port_forwards(vec![port_forward(23000, 5174)]),
|
|
);
|
|
|
|
cache.reset_if_runtime_config_cache_epoch_changed(0);
|
|
|
|
assert!(cache.runtime_configs.entries.contains_key("managed"));
|
|
}
|
|
|
|
#[test]
|
|
fn direct_runtime_mutation_invalidates_runtime_config_cache() {
|
|
let mut cache = ReconcileCache::default();
|
|
cache.runtime_configs.remember(
|
|
"managed",
|
|
config_with_port_forwards(vec![port_forward(23000, 5174)]),
|
|
);
|
|
|
|
cache.reset_if_runtime_config_cache_epoch_changed(1);
|
|
|
|
assert!(!cache.runtime_configs.entries.contains_key("managed"));
|
|
assert_eq!(cache.runtime_config_cache_epoch, 1);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn patch_scope_reads_latest_persisted_state_for_dirty_instances() {
|
|
let storage =
|
|
crate::client_manager::storage::Storage::new(crate::db::Db::memory_db().await);
|
|
let user_id = storage.db().auto_create_user("token").await.unwrap().id;
|
|
let machine_id = uuid::Uuid::new_v4();
|
|
let persisted_id = uuid::Uuid::new_v4();
|
|
let missing_id = uuid::Uuid::new_v4();
|
|
crate::client_manager::managed_config::reconcile_web_source_configs(
|
|
&storage,
|
|
user_id,
|
|
machine_id,
|
|
vec![crate::webhook::ManagedNetworkConfig {
|
|
instance_id: persisted_id.to_string(),
|
|
network_config: serde_json::to_value(config_with_port_forwards(Vec::new()))
|
|
.unwrap(),
|
|
}],
|
|
Some("rev-1"),
|
|
crate::client_manager::managed_config::ExpectedConfigRevision::Any,
|
|
)
|
|
.await
|
|
.unwrap();
|
|
let scope = ReconcileScope::Patch {
|
|
dirty_instance_ids: HashSet::from([persisted_id.to_string(), missing_id.to_string()]),
|
|
};
|
|
|
|
let storage_inner = storage.weak_ref().upgrade().unwrap();
|
|
let (configs, deleted) = load_round_configs(&storage_inner, user_id, machine_id, &scope)
|
|
.await
|
|
.unwrap()
|
|
.unwrap();
|
|
|
|
assert_eq!(configs.len(), 1);
|
|
assert_eq!(configs[0].network_instance_id, persisted_id.to_string());
|
|
assert_eq!(deleted, HashSet::from([missing_id.to_string()]));
|
|
|
|
crate::client_manager::managed_config::patch_web_source_configs(
|
|
&storage,
|
|
user_id,
|
|
machine_id,
|
|
Vec::new(),
|
|
vec![persisted_id],
|
|
"rev-2",
|
|
"rev-1",
|
|
)
|
|
.await
|
|
.unwrap();
|
|
|
|
let (configs, deleted) = load_round_configs(&storage_inner, user_id, machine_id, &scope)
|
|
.await
|
|
.unwrap()
|
|
.unwrap();
|
|
|
|
assert!(configs.is_empty());
|
|
assert_eq!(
|
|
deleted,
|
|
HashSet::from([persisted_id.to_string(), missing_id.to_string()])
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn session_runtime_config_cache_misses_unknown_instance() {
|
|
let cache = SessionRuntimeConfigCache::default();
|
|
let action = cache
|
|
.plan("missing", config_with_port_forwards(Vec::new()))
|
|
.expect("prepare action");
|
|
|
|
assert!(action.is_none());
|
|
}
|
|
|
|
#[test]
|
|
fn session_runtime_config_cache_skips_matching_observed_config() {
|
|
let mut cache = SessionRuntimeConfigCache::default();
|
|
let config = config_with_port_forwards(vec![port_forward(23000, 5174)]);
|
|
|
|
cache.remember("managed", config.clone());
|
|
let action = cache
|
|
.plan("managed", config)
|
|
.expect("prepare action")
|
|
.expect("cached action");
|
|
|
|
assert!(matches!(
|
|
action,
|
|
runtime_reconcile::RuntimeReconcileAction::Unchanged(_)
|
|
));
|
|
}
|
|
|
|
#[test]
|
|
fn cache_preserves_ignored_runtime_hostname_for_later_explicit_clear() {
|
|
let mut cache = SessionRuntimeConfigCache::default();
|
|
let mut observed = config_with_port_forwards(Vec::new());
|
|
observed.hostname = Some("runtime-host".to_string());
|
|
cache.remember("managed", observed);
|
|
|
|
let unmanaged_desired = config_with_port_forwards(Vec::new());
|
|
let action = cache
|
|
.plan("managed", unmanaged_desired)
|
|
.expect("prepare unmanaged hostname action")
|
|
.expect("cached action");
|
|
let runtime_reconcile::RuntimeReconcileAction::Unchanged(observed) = action else {
|
|
panic!("unmanaged hostname should preserve the observed config");
|
|
};
|
|
assert_eq!(observed.hostname.as_deref(), Some("runtime-host"));
|
|
cache.remember("managed", *observed);
|
|
|
|
let mut explicit_clear = config_with_port_forwards(Vec::new());
|
|
explicit_clear.hostname = Some(String::new());
|
|
let action = cache
|
|
.plan("managed", explicit_clear)
|
|
.expect("prepare explicit clear action")
|
|
.expect("cached action");
|
|
let runtime_reconcile::RuntimeReconcileAction::Patch(patch) = action else {
|
|
panic!("explicit clear should patch the observed runtime hostname");
|
|
};
|
|
|
|
assert_eq!(patch.hostname.as_deref(), Some(""));
|
|
}
|
|
|
|
#[test]
|
|
fn session_runtime_config_cache_plans_patch_from_observed_config() {
|
|
let mut cache = SessionRuntimeConfigCache::default();
|
|
let current = config_with_port_forwards(vec![port_forward(23000, 5174)]);
|
|
let desired =
|
|
config_with_port_forwards(vec![port_forward(23000, 5174), port_forward(23007, 3389)]);
|
|
|
|
cache.remember("managed", current);
|
|
let action = cache
|
|
.plan("managed", desired)
|
|
.expect("prepare action")
|
|
.expect("cached action");
|
|
|
|
let runtime_reconcile::RuntimeReconcileAction::Patch(patch) = action else {
|
|
panic!("expected cached runtime config to produce hot patch");
|
|
};
|
|
assert_eq!(patch.port_forwards.len(), 1);
|
|
}
|
|
|
|
#[test]
|
|
fn session_runtime_config_cache_retain_desired_removes_stale_entries() {
|
|
let mut cache = SessionRuntimeConfigCache::default();
|
|
let config = config_with_port_forwards(Vec::new());
|
|
cache.remember("keep", config.clone());
|
|
cache.remember("drop", config);
|
|
|
|
cache.retain_desired(&HashSet::from(["keep".to_string()]));
|
|
|
|
assert!(cache.entries.contains_key("keep"));
|
|
assert!(!cache.entries.contains_key("drop"));
|
|
}
|
|
|
|
#[test]
|
|
fn session_runtime_config_cache_forget_removes_observed_config() {
|
|
let mut cache = SessionRuntimeConfigCache::default();
|
|
let config = config_with_port_forwards(Vec::new());
|
|
cache.remember("managed", config.clone());
|
|
|
|
cache.forget("managed");
|
|
|
|
let action = cache
|
|
.plan("managed", config)
|
|
.expect("prepare action after remove");
|
|
assert!(action.is_none());
|
|
}
|
|
|
|
#[test]
|
|
fn missing_run_remembers_observed_config_when_it_matches_desired() {
|
|
let mut cache = SessionRuntimeConfigCache::default();
|
|
let config = config_with_port_forwards(vec![port_forward(23000, 5174)]);
|
|
|
|
remember_if_runtime_matches_desired("managed", &config, config.clone(), &mut cache)
|
|
.expect("remember observed config after run");
|
|
let action = cache
|
|
.plan("managed", config)
|
|
.expect("prepare action after run")
|
|
.expect("cached action");
|
|
|
|
assert!(matches!(
|
|
action,
|
|
runtime_reconcile::RuntimeReconcileAction::Unchanged(_)
|
|
));
|
|
}
|
|
|
|
#[test]
|
|
fn missing_run_does_not_remember_observed_config_that_still_differs() {
|
|
let mut cache = SessionRuntimeConfigCache::default();
|
|
let current = config_with_port_forwards(vec![port_forward(23000, 5174)]);
|
|
let desired =
|
|
config_with_port_forwards(vec![port_forward(23000, 5174), port_forward(23007, 3389)]);
|
|
|
|
let err = remember_if_runtime_matches_desired("managed", &desired, current, &mut cache)
|
|
.expect_err("expected stale run result not to be cached");
|
|
|
|
assert!(
|
|
err.to_string()
|
|
.contains("runtime config still differs after managed run")
|
|
);
|
|
let action = cache
|
|
.plan("managed", desired)
|
|
.expect("prepare action after stale run result");
|
|
assert!(action.is_none());
|
|
}
|
|
|
|
#[test]
|
|
fn missing_run_does_not_accept_omitted_hostname() {
|
|
let mut cache = SessionRuntimeConfigCache::default();
|
|
let observed = config_with_port_forwards(Vec::new());
|
|
let mut desired = observed.clone();
|
|
desired.hostname = Some("device-host".to_string());
|
|
|
|
let err = remember_if_runtime_matches_desired("managed", &desired, observed, &mut cache)
|
|
.expect_err("missing run must not trust an omitted hostname");
|
|
|
|
assert!(
|
|
err.to_string()
|
|
.contains("runtime config still differs after managed run")
|
|
);
|
|
assert!(!cache.entries.contains_key("managed"));
|
|
}
|
|
|
|
#[test]
|
|
fn restored_omitted_hostname_prevents_repeated_hostname_patch() {
|
|
let mut desired = config_with_port_forwards(Vec::new());
|
|
desired.hostname = Some("device-host".to_string());
|
|
let mut observed = desired.clone();
|
|
observed.hostname = None;
|
|
|
|
runtime_reconcile::restore_omitted_hostname(&mut observed, &desired, true);
|
|
assert_eq!(observed.hostname.as_deref(), Some("device-host"));
|
|
|
|
let mut cache = SessionRuntimeConfigCache::default();
|
|
cache.remember("managed", observed);
|
|
let action = cache
|
|
.plan("managed", desired)
|
|
.expect("prepare action after restore")
|
|
.expect("cached action");
|
|
|
|
assert!(matches!(
|
|
action,
|
|
runtime_reconcile::RuntimeReconcileAction::Unchanged(_)
|
|
));
|
|
}
|
|
|
|
fn round_with_revision_state(
|
|
target_config_revision: Option<&str>,
|
|
should_apply_runtime_revision: bool,
|
|
) -> ReconcileRound {
|
|
ReconcileRound {
|
|
req: HeartbeatRequest::default(),
|
|
machine_id: uuid::Uuid::new_v4(),
|
|
user_id: 1,
|
|
running_inst_ids: HashSet::new(),
|
|
local_configs: Vec::new(),
|
|
delete_instance_ids: HashSet::new(),
|
|
target_config_revision: target_config_revision.map(str::to_string),
|
|
should_apply_runtime_revision,
|
|
scope: ReconcileScope::Full,
|
|
runtime_config_epoch: 0,
|
|
runtime_config_cache_epoch: 0,
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn running_web_configs_reconcile_without_tracked_revision() {
|
|
use crate::client_manager::managed_config::PersistedConfigSource;
|
|
|
|
assert!(should_reconcile_running_web_config(
|
|
true,
|
|
PersistedConfigSource::Web,
|
|
&round_with_revision_state(None, false),
|
|
));
|
|
assert!(!should_reconcile_running_web_config(
|
|
true,
|
|
PersistedConfigSource::Web,
|
|
&round_with_revision_state(Some("rev-a"), false),
|
|
));
|
|
assert!(should_reconcile_running_web_config(
|
|
true,
|
|
PersistedConfigSource::Web,
|
|
&round_with_revision_state(Some("rev-a"), true),
|
|
));
|
|
assert!(!should_reconcile_running_web_config(
|
|
true,
|
|
PersistedConfigSource::User,
|
|
&round_with_revision_state(None, false),
|
|
));
|
|
assert!(!should_reconcile_running_web_config(
|
|
false,
|
|
PersistedConfigSource::Web,
|
|
&round_with_revision_state(None, false),
|
|
));
|
|
}
|
|
}
|