mirror of
https://github.com/hanzoai/datastore.git
synced 2026-09-26 13:55:07 +00:00
Branch was 1157 commits behind master and the only CI red was the chronic master-wide `Hung check failed, possible deadlock found` flake (13-70/day on master itself; this PR is a compile-time no-op under `SANITIZER` so it cannot affect the `arm_asan_ubsan` stress run). Re-merge to refresh CI on the current master and to re-run the AI review against the already-updated PR description. The merge conflicted only in `src/Common/MemoryWorker.cpp`: master evolved the `memory_worker_dynamic_hard_limit` apply block to skip adjustments smaller than `min_change_ratio` (1%) of the current limit, still naming the local `current_hard_limit`. The branch had renamed that local to `installed_hard_limit` to avoid shadowing the `current_hard_limit` the speculative-reserve block reads earlier in `updateResidentMemoryThread` (`-Wshadow`/`-Werror`). Kept master's new threshold logic verbatim and renamed its local to `installed_hard_limit`; the `LOG_TRACE` already references `installed_hard_limit`. No behavior change. Verified the resolved `MemoryWorker.cpp` compiles cleanly (`-fsyntax-only`, `-Werror -Wall -Wextra`) against the merged tree.