Merge 'sverker/26/erts/halt-race-fix/OTP-19490'

into sverker/27/erts/halt-race-fix/OTP-19490
erlang · Feb 13, 2025 · 12c312f · 12c312f
2 parents 5e883a9 + c066990
commit 12c312f
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
@@ -4055,6 +4055,10 @@ BIF_RETTYPE halt_2(BIF_ALIST_2)
 		("System halted by BIF halt(%T, %T)\n", BIF_ARG_1, BIF_ARG_2));
 	if (flush) {
 	    erts_halt(pos_int_code, halt_flush_timeout);
+            /* We lost race against other halt call.
+               Suspend this process and do a dummy trap while waiting
+               for other halt call to terminate the beam. */
+            erts_suspend(BIF_P, ERTS_PROC_LOCK_MAIN, NULL);
 	    ERTS_BIF_YIELD2(BIF_TRAP_EXPORT(BIF_halt_2), BIF_P, am_undefined, am_undefined);
 	}
 	else {