@@ -50,7 +50,10 @@ function updateRunMachines(update: (machine: UpdateRunMachine) => UpdateRunMachi
5050export function settleUpdateRunMachine (
5151 environmentId : EnvironmentId ,
5252 failure : string | null ,
53- { serverUpdated = false } : { readonly serverUpdated ?: boolean } = { } ,
53+ {
54+ serverUpdated = false ,
55+ providerFailure,
56+ } : { readonly serverUpdated ?: boolean ; readonly providerFailure ?: string | null } = { } ,
5457) : void {
5558 updateRunMachines ( ( machine ) =>
5659 machine . environmentId === environmentId
@@ -59,6 +62,7 @@ export function settleUpdateRunMachine(
5962 result : failure === null ? "done" : "failed" ,
6063 failure,
6164 ...( serverUpdated ? { server : null } : { } ) ,
65+ ...( providerFailure === undefined ? { } : { providerFailure } ) ,
6266 }
6367 : machine ,
6468 ) ;
@@ -71,26 +75,31 @@ export function retryFailedUpdateRunServers(
7175 options : { readonly quiet : boolean } ,
7276 ) => Promise < ServerUpdateOutcome > ,
7377) : void {
74- const targets = ( appAtomRegistry . get ( updateEverythingRunAtom ) ?. machines ?? [ ] ) . flatMap (
75- ( machine ) => ( machine . result === "failed" && machine . server !== null ? [ machine . server ] : [ ] ) ,
78+ const failed = ( appAtomRegistry . get ( updateEverythingRunAtom ) ?. machines ?? [ ] ) . flatMap (
79+ ( machine ) =>
80+ machine . result === "failed" && machine . server !== null
81+ ? [ { target : machine . server , providerFailure : machine . providerFailure } ]
82+ : [ ] ,
7683 ) ;
84+ const targets = failed . map ( ( { target } ) => target ) ;
7785 const retried = new Set ( targets . map ( ( target ) => target . environmentId ) ) ;
7886 const startedAt = Date . now ( ) ;
7987 updateRunMachines ( ( machine ) =>
8088 retried . has ( machine . environmentId )
8189 ? { ...machine , result : null , failure : null , startedAt }
8290 : machine ,
8391 ) ;
84- for ( const target of targets ) {
92+ for ( const { target, providerFailure } of failed ) {
8593 void update ( target , { quiet : true } ) . then ( ( outcome ) =>
8694 settleUpdateRunMachine (
8795 target . environmentId ,
8896 // A skipped retry (no permission, disconnected, interrupted) did not update.
8997 outcome . status === "updated"
90- ? null
98+ ? providerFailure
9199 : outcome . status === "failed"
92100 ? outcome . message
93101 : "Could not start the update" ,
102+ { serverUpdated : outcome . status === "updated" } ,
94103 ) ,
95104 ) ;
96105 }
@@ -285,6 +294,7 @@ function followHandedOffServers(servers: ReadonlyArray<HandedOffServer>): void {
285294 startedAt : server . startedAt ,
286295 result : null ,
287296 failure : null ,
297+ providerFailure : null ,
288298 } ) ) ,
289299 } ) ) ;
290300 let remaining = servers . length ;
0 commit comments