Skip to content

bring back OOM work into branch#7069

Merged
JoanFM merged 1 commit intooshadmi_merge-master-into-feature-coordinator-hybridfrom
joan-recover-OOM-lermans-work
Oct 15, 2025
Merged

bring back OOM work into branch#7069
JoanFM merged 1 commit intooshadmi_merge-master-into-feature-coordinator-hybridfrom
joan-recover-OOM-lermans-work

Conversation

@JoanFM
Copy link
Collaborator

@JoanFM JoanFM commented Oct 15, 2025

Note

Captures shard errors in profiling and updates error propagation to parse error codes and respect timeout/OOM policies, including emitting OOM warnings when configured to continue.

  • coord (src/coord/rpnet.c):
    • Profiling: When an error reply is received and forProfiling is set, clone and append the error to shardsProfile.
    • Error handling:
      • Parse error code via extractQueryErrorFromReply and decide to fail or continue based on timeoutPolicy and oomPolicy.
      • On non-fatal OOM, set query OOM warning and continue; free error reply and clear current.root to avoid double free.
      • Preserve behavior for generic errors (propagate as error).

Written by Cursor Bugbot for commit ef7382f. This will update automatically on new commits. Configure here.

// Free the error reply before we override it and continue
MRReply_Free(nc->current.root);
// Set it as NULL avoid another free
nc->current.root = NULL;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bug: Error Handling Masks Critical Failures

The new error handling in rpnet.c only propagates QUERY_EGENERIC, QUERY_ETIMEDOUT, and QUERY_EOOM errors. Any other error type from extractQueryErrorFromReply is silently discarded, potentially masking critical failures and changing the previous, more general error behavior.

Fix in Cursor Fix in Web

@JoanFM JoanFM merged commit 63e1d78 into oshadmi_merge-master-into-feature-coordinator-hybrid Oct 15, 2025
13 of 16 checks passed
@JoanFM JoanFM deleted the joan-recover-OOM-lermans-work branch October 15, 2025 20:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant