fix: keep Ctrl-C raised while releasing freed memory after rules, and make the compile interrupt test deterministic

Author: kvlonge

crates/sqlbuild-python/src/bindings/_helpers/rules/rule_plan.rs

@@ -33,7 +33,7 @@ pub(crate) fn plan_rule_run<'py>(
     let py: Python<'py> = options.py();
     let graph: Bound<'py, PyAny> = options.get("graph")?;
     let project: Bound<'py, PyAny> = field(&graph, "project")?;
-    freed_memory_released(py);
+    freed_memory_released(py)?;
     let effective_config: Bound<'py, PyAny> =
         resolved_ignore_selectors(&options.get("config")?, &project)?;
     let project_dir: Bound<'py, PyAny> = options.get("project_dir")?.call_method0("resolve")?;

crates/sqlbuild-python/src/bindings/_helpers/rules/rule_run.rs

@@ -3,6 +3,7 @@
 use std::collections::BTreeSet;
 use std::path::PathBuf;
 
+use pyo3::exceptions::PyException;
 use pyo3::prelude::{Bound, PyAny, PyAnyMethods, PyModule, PyModuleMethods, PyResult, Python};
 use pyo3::types::{PyDict, PyTuple, PyTupleMethods};
 use pyo3::{IntoPyObjectExt, pyfunction, wrap_pyfunction};
@@ -145,16 +146,19 @@ fn rules_bulk_cache_path(project_dir: PathBuf, file_name: &str) -> PathBuf {
 }
 
 /// Hand freed glibc heap pages back to the OS; a no-op elsewhere or without `malloc_trim`.
-pub(crate) fn freed_memory_released(py: Python<'_>) {
+pub(crate) fn freed_memory_released(py: Python<'_>) -> PyResult<()> {
     if !cfg!(target_os = "linux") {
-        return;
+        return Ok(());
     }
     let trim = || -> PyResult<()> {
         let process: Bound<'_, PyAny> = imported(py, CTYPES_MODULE, "CDLL")?.call1((py.None(),))?;
         let _ = native_field(&process, "malloc_trim")?.call1((0,))?;
         Ok(())
     };
-    let _ = trim();
+    match trim() {
+        Err(error) if !error.is_instance_of::<PyException>(py) => Err(error),
+        _ => Ok(()),
+    }
 }
 
 pub(crate) fn register(module: &Bound<'_, PyModule>) -> PyResult<()> {

tests/e2e/src/sqlbuild/cli/commands/main/compile/helpers.py

@@ -4966,6 +4966,8 @@ def compile_with_binding_error(project_dir: Path) -> dict[str, Any]:
     "import time\n\n\n"
     "def slow_total(amount: str) -> str:\n"
     '    """Return the amount, pausing for the macro tests that only SQL lint expands."""\n'
+    "    if amount == 'model_amount':\n"
+    "        time.sleep(2.0)\n"
     "    if amount == 'slow_amount':\n"
     "        with open(os.environ['SLOW_MACRO_MARKER'], 'a', encoding='utf-8') as marker:\n"
     "            marker.write('expanding\\n')\n"
@@ -4985,7 +4987,8 @@ def slow_lint_model_files(*, model_count: int) -> dict[str, str]:
         ),
         "models/slow_total.sql": (
             'MODEL (description "Slow total");\n'
-            'SELECT @slow_total("amount") AS amount FROM (SELECT 5 AS amount) AS input_values\n'
+            'SELECT @slow_total("model_amount") AS amount\n'
+            "FROM (SELECT 5 AS model_amount) AS input_values\n"
         ),
         **{
             f"tests/slow_total_{index}.sql": (
@@ -5001,3 +5004,9 @@ def slow_lint_model_files(*, model_count: int) -> dict[str, str]:
             for index in range(model_count)
         },
     }
+
+
+def restore_default_interrupt() -> None:
+    """Give a spawned command default Ctrl-C handling even when its parent ignores SIGINT."""
+
+    _ = signal.signal(signal.SIGINT, signal.SIG_DFL)

tests/e2e/src/sqlbuild/cli/commands/main/compile/test_compile_early_lint.py

@@ -19,6 +19,7 @@
 from tests.e2e.src.sqlbuild.cli.commands.main.compile.helpers import (
     compile_json_payload,
     diagnostic_location_keys,
+    restore_default_interrupt,
     slow_lint_model_files,
 )
 from tests.e2e.src.sqlbuild.cli.commands.shared.helpers import prepare_inline_project
@@ -132,6 +133,7 @@ def test_given_slow_background_lint_when_interrupted_then_compile_stops_promptly
             "SLOW_MACRO_MARKER": str(marker),
             "SLOW_MACRO_SECONDS": str(test_case.macro_seconds),
         },
+        preexec_fn=restore_default_interrupt,
     )
     deadline: float = time.monotonic() + 60.0
     while not marker.exists() and time.monotonic() < deadline and process.poll() is None: