[WIP][server] Allow re-triggering failed Prebuilds

Author: jankeromnes

components/gitpod-db/src/typeorm/workspace-db-impl.ts

@@ -560,6 +560,7 @@ export abstract class AbstractTypeORMWorkspaceDBImpl implements WorkspaceDB {
         return await repo.save(pws as DBPrebuiltWorkspace);
     }
 
+    // Find the (last triggered) prebuild for a given commit
     public async findPrebuiltWorkspaceByCommit(cloneURL: string, commit: string): Promise<PrebuiltWorkspace | undefined> {
         if (!commit || !cloneURL) {
             return undefined;

components/gitpod-protocol/src/teams-projects-protocol.ts

@@ -93,7 +93,6 @@ export namespace PrebuildInfo {
 export interface StartPrebuildResult {
     wsid: string;
     done: boolean;
-    didFinish?: boolean;
 }
 
 export interface Team {

components/server/ee/src/prebuilds/prebuild-manager.ts

@@ -67,7 +67,10 @@ export class PrebuildManager {
         try {
             const existingPB = await this.workspaceDB.trace({ span }).findPrebuiltWorkspaceByCommit(cloneURL, commit);
             if (!!existingPB) {
-                return { wsid: existingPB.buildWorkspaceId, done: true, didFinish: existingPB.state === 'available' };
+                // If the prebuild is failed, we want to retrigger it.
+                if (!['aborted', 'timeout'].includes(existingPB.state) && !existingPB.error) {
+                    return { wsid: existingPB.buildWorkspaceId, done: true };
+                }
             }
 
             const contextParser = this.getContextParserFor(contextURL);

components/server/ee/src/workspace/gitpod-server-impl.ts

@@ -694,6 +694,7 @@ export class GitpodServerEEImpl extends GitpodServerImpl<GitpodClient, GitpodSer
 
             const logCtx: LogContext = { userId: user.id };
             const cloneUrl = context.repository.cloneUrl;
+            // Note: findPrebuiltWorkspaceByCommit always returns the last triggered prebuild (so, if you re-trigger a prebuild, the newer one will always be used here)
             const prebuiltWorkspace = await this.workspaceDb.trace({ span }).findPrebuiltWorkspaceByCommit(cloneUrl, context.revision);
             const logPayload = { mode, cloneUrl, commit: context.revision, prebuiltWorkspace };
             log.debug(logCtx, "Looking for prebuilt workspace: ", logPayload);