File tree Expand file tree Collapse file tree 1 file changed +10
-5
lines changed Expand file tree Collapse file tree 1 file changed +10
-5
lines changed Original file line number Diff line number Diff line change @@ -415,6 +415,14 @@ export class Checkpointer {
415
415
const buildah = new Buildah ( { id : `${ runId } -${ shortCode } ` , abortSignal : controller . signal } ) ;
416
416
const crictl = new Crictl ( { id : `${ runId } -${ shortCode } ` , abortSignal : controller . signal } ) ;
417
417
418
+ const removeCurrentAbortController = ( ) => {
419
+ // Ensure only the current controller is removed
420
+ if ( this . #abortControllers. get ( runId ) === controller ) {
421
+ this . #abortControllers. delete ( runId ) ;
422
+ }
423
+ controller . signal . removeEventListener ( "abort" , onAbort ) ;
424
+ } ;
425
+
418
426
const cleanup = async ( ) => {
419
427
const metadata = {
420
428
runId,
@@ -424,6 +432,7 @@ export class Checkpointer {
424
432
425
433
if ( this . #dockerMode) {
426
434
this . #logger. debug ( "Skipping cleanup in docker mode" , metadata ) ;
435
+ removeCurrentAbortController ( ) ;
427
436
return ;
428
437
}
429
438
@@ -436,11 +445,7 @@ export class Checkpointer {
436
445
this . #logger. error ( "Error during cleanup" , { ...metadata , error } ) ;
437
446
}
438
447
439
- // Ensure only the current controller is removed
440
- if ( this . #abortControllers. get ( runId ) === controller ) {
441
- this . #abortControllers. delete ( runId ) ;
442
- }
443
- controller . signal . removeEventListener ( "abort" , onAbort ) ;
448
+ removeCurrentAbortController ( ) ;
444
449
} ;
445
450
446
451
try {
You can’t perform that action at this time.
0 commit comments