Skip to content

Commit bf46b91

Browse files
committed
fix(mem): honor explicit worker budget override
Signed-off-by: Atirna <[email protected]>
1 parent 3162f09 commit bf46b91

2 files changed

Lines changed: 24 additions & 10 deletions

File tree

‎src/foundation/mem.c‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,10 +248,19 @@ cbm_mem_budget_t cbm_mem_resolve_budget(size_t total_ram, double ram_fraction,
248248
cbm_mem_budget_t cbm_mem_resolve_budget_capped(size_t total_ram, double ram_fraction,
249249
const char *budget_mb, size_t hard_cap_bytes) {
250250
cbm_mem_budget_t result = cbm_mem_resolve_budget(total_ram, ram_fraction, budget_mb);
251-
if (hard_cap_bytes > 0 && (result.budget == 0 || result.budget > hard_cap_bytes)) {
252-
result.budget = hard_cap_bytes;
253-
result.source = "daemon_worker_cap";
254-
result.hard_capped = true;
251+
/* CBM_MEM_BUDGET_MB is the user-facing emergency override for a single
252+
* large index. Applying the daemon's equal-share cap after resolving it
253+
* makes a requested raise indistinguishable from the default and leaves a
254+
* worker stuck at a quarter of the host budget (#1654). The normal
255+
* fraction-derived path remains capped, preserving aggregate admission for
256+
* concurrent jobs; an explicit value remains clamped to detected RAM by
257+
* cbm_mem_resolve_budget(). */
258+
if (result.source == NULL || strcmp(result.source, "CBM_MEM_BUDGET_MB") != 0) {
259+
if (hard_cap_bytes > 0 && (result.budget == 0 || result.budget > hard_cap_bytes)) {
260+
result.budget = hard_cap_bytes;
261+
result.source = "daemon_worker_cap";
262+
result.hard_capped = true;
263+
}
255264
}
256265
return result;
257266
}

‎tests/test_mem.c‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -490,18 +490,23 @@ TEST(resolve_budget_override_when_total_unknown) {
490490
PASS();
491491
}
492492

493-
TEST(resolve_budget_worker_cap_preserves_lower_user_override) {
493+
/* A user who explicitly raises CBM_MEM_BUDGET_MB must not be silently reduced
494+
* by the daemon's capacity slice. The parent-level slice still protects the
495+
* default path, but the explicit override is the documented escape hatch for a
496+
* single large index (#1654). Before the fix, a 64 MiB request was reported as
497+
* daemon_worker_cap at 16 MiB instead of honoring the requested 64 MiB. */
498+
TEST(resolve_budget_worker_cap_honors_explicit_override) {
494499
size_t total = 8192 * CBM_TEST_MB;
495500
size_t worker_cap = 16 * CBM_TEST_MB;
496501
cbm_mem_budget_t lower = cbm_mem_resolve_budget_capped(total, 0.5, "8", worker_cap);
497502
ASSERT_EQ(lower.budget, 8 * CBM_TEST_MB);
498503
ASSERT_STR_EQ(lower.source, "CBM_MEM_BUDGET_MB");
499504
ASSERT_FALSE(lower.hard_capped);
500505

501-
cbm_mem_budget_t capped = cbm_mem_resolve_budget_capped(total, 0.5, "64", worker_cap);
502-
ASSERT_EQ(capped.budget, worker_cap);
503-
ASSERT_STR_EQ(capped.source, "daemon_worker_cap");
504-
ASSERT_TRUE(capped.hard_capped);
506+
cbm_mem_budget_t raised = cbm_mem_resolve_budget_capped(total, 0.5, "64", worker_cap);
507+
ASSERT_EQ(raised.budget, 64 * CBM_TEST_MB);
508+
ASSERT_STR_EQ(raised.source, "CBM_MEM_BUDGET_MB");
509+
ASSERT_FALSE(raised.hard_capped);
505510
PASS();
506511
}
507512

@@ -1288,7 +1293,7 @@ SUITE(mem) {
12881293
RUN_TEST(resolve_budget_override_wins);
12891294
RUN_TEST(resolve_budget_override_clamped_to_total);
12901295
RUN_TEST(resolve_budget_override_when_total_unknown);
1291-
RUN_TEST(resolve_budget_worker_cap_preserves_lower_user_override);
1296+
RUN_TEST(resolve_budget_worker_cap_honors_explicit_override);
12921297
RUN_TEST(resolve_budget_invalid_override_falls_back);
12931298
RUN_TEST(resolve_budget_override_overflow_clamps_to_total);
12941299
RUN_TEST(resolve_budget_override_overflow_total_unknown_caps);

0 commit comments

Comments
 (0)