During the previous merge I carefully merged backend.py, in which batch_handle.id gained batch_id as an alias, but they were equivalent so I left batch_handle.id as is in our patches.
During the 0.2.126 + fix-non-responsive-VMs merge, I didn't notice that ebfbc24e223aef893091ca9de4780b1be1023ad2 (committed only a few hours before the OOM fix!) refactored batch_handle out of existence. 😞
This PR belatedly uses batch_id instead, and reorders this code so that only the if not wait: print(…) is simply added to upstream backend.py rather than a more complex more conflict-prone change.
During the previous merge I carefully merged backend.py, in which
batch_handle.idgainedbatch_idas an alias, but they were equivalent so I leftbatch_handle.idas is in our patches.During the 0.2.126 + fix-non-responsive-VMs merge, I didn't notice that ebfbc24e223aef893091ca9de4780b1be1023ad2 (committed only a few hours before the OOM fix!) refactored
batch_handleout of existence. 😞This PR belatedly uses
batch_idinstead, and reorders this code so that only theif not wait: print(…)is simply added to upstream backend.py rather than a more complex more conflict-prone change.Context: https://centrepopgen.slack.com/archives/C030X7WGFCL/p1699929176858399