Skip to content

Commit 92812ae

Browse files
committed
fix(mem): treat CBM_MEM_BUDGET_MB as an aggregate ceiling
Keep the source-string discriminator and still apply the parent equal-share cap so N workers cannot oversubscribe the host. Signed-off-by: Atirna <288419661+atirna@users.noreply.github.com>
1 parent 36ea43b commit 92812ae

3 files changed

Lines changed: 27 additions & 21 deletions

File tree

‎src/foundation/mem.c‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -248,19 +248,20 @@ 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-
/* 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;
251+
/* The parent already divided the aggregate budget (env override or
252+
* ram_fraction) across job slots. That per-slot share is the hard cap:
253+
* N workers × a per-worker absolute override would oversubscribe the host
254+
* (#1654). A lower explicit value still wins. Keep CBM_MEM_BUDGET_MB as
255+
* the source when the env discriminator fired so the ceiling is visible
256+
* as the user's aggregate, not as a silent daemon_worker_cap rewrite. */
257+
if (hard_cap_bytes > 0 && (result.budget == 0 || result.budget > hard_cap_bytes)) {
258+
bool explicit_override =
259+
result.source != NULL && strcmp(result.source, "CBM_MEM_BUDGET_MB") == 0;
260+
result.budget = hard_cap_bytes;
261+
if (!explicit_override) {
261262
result.source = "daemon_worker_cap";
262-
result.hard_capped = true;
263263
}
264+
result.hard_capped = true;
264265
}
265266
return result;
266267
}

‎src/foundation/mem.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ void cbm_mem_init_with_cap(double ram_fraction, size_t hard_cap_bytes);
3131
* the caller never re-parses the env string. */
3232
typedef struct {
3333
size_t budget; /* resolved budget in bytes */
34-
const char *source; /* log token: "ram_fraction" | "CBM_MEM_BUDGET_MB" */
34+
const char *source; /* "ram_fraction" | "CBM_MEM_BUDGET_MB" | "daemon_worker_cap" */
3535
bool clamped; /* override was valid but exceeded total_ram → clamped down */
3636
bool invalid; /* override was present but unparseable / out-of-range / ≤0 */
3737
bool hard_capped; /* internal worker hard cap reduced the resolved budget */

‎tests/test_mem.c‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -516,12 +516,12 @@ TEST(resolve_budget_override_when_total_unknown) {
516516
PASS();
517517
}
518518

519-
/* A user who explicitly raises CBM_MEM_BUDGET_MB must not be silently reduced
520-
* by the daemon's capacity slice. The parent-level slice still protects the
521-
* default path, but the explicit override is the documented escape hatch for a
522-
* single large index (#1654). Before the fix, a 64 MiB request was reported as
523-
* daemon_worker_cap at 16 MiB instead of honoring the requested 64 MiB. */
524-
TEST(resolve_budget_worker_cap_honors_explicit_override) {
519+
/* CBM_MEM_BUDGET_MB is an aggregate ceiling the parent divides across job
520+
* slots. A lower explicit value still wins; a raise is clipped to the per-slot
521+
* share so N workers cannot oversubscribe the host (#1654). The source stays
522+
* CBM_MEM_BUDGET_MB so the clip is the user's aggregate, not a silent
523+
* daemon_worker_cap rewrite of a fraction-derived default. */
524+
TEST(resolve_budget_worker_cap_preserves_lower_user_override) {
525525
size_t total = 8192 * CBM_TEST_MB;
526526
size_t worker_cap = 16 * CBM_TEST_MB;
527527
cbm_mem_budget_t lower = cbm_mem_resolve_budget_capped(total, 0.5, "8", worker_cap);
@@ -530,9 +530,14 @@ TEST(resolve_budget_worker_cap_honors_explicit_override) {
530530
ASSERT_FALSE(lower.hard_capped);
531531

532532
cbm_mem_budget_t raised = cbm_mem_resolve_budget_capped(total, 0.5, "64", worker_cap);
533-
ASSERT_EQ(raised.budget, 64 * CBM_TEST_MB);
533+
ASSERT_EQ(raised.budget, worker_cap);
534534
ASSERT_STR_EQ(raised.source, "CBM_MEM_BUDGET_MB");
535-
ASSERT_FALSE(raised.hard_capped);
535+
ASSERT_TRUE(raised.hard_capped);
536+
537+
cbm_mem_budget_t fraction = cbm_mem_resolve_budget_capped(total, 0.5, NULL, worker_cap);
538+
ASSERT_EQ(fraction.budget, worker_cap);
539+
ASSERT_STR_EQ(fraction.source, "daemon_worker_cap");
540+
ASSERT_TRUE(fraction.hard_capped);
536541
PASS();
537542
}
538543

@@ -1320,7 +1325,7 @@ SUITE(mem) {
13201325
RUN_TEST(resolve_budget_override_wins);
13211326
RUN_TEST(resolve_budget_override_clamped_to_total);
13221327
RUN_TEST(resolve_budget_override_when_total_unknown);
1323-
RUN_TEST(resolve_budget_worker_cap_honors_explicit_override);
1328+
RUN_TEST(resolve_budget_worker_cap_preserves_lower_user_override);
13241329
RUN_TEST(resolve_budget_invalid_override_falls_back);
13251330
RUN_TEST(resolve_budget_override_overflow_clamps_to_total);
13261331
RUN_TEST(resolve_budget_override_overflow_total_unknown_caps);

0 commit comments

Comments
 (0)