v7

Author: jankeromnes

components/server/ee/src/workspace/workspace-factory.ts

@@ -8,7 +8,7 @@ import * as uuidv4 from 'uuid/v4';
 import { WorkspaceFactory } from "../../../src/workspace/workspace-factory";
 import { injectable, inject } from "inversify";
 import { TraceContext } from "@gitpod/gitpod-protocol/lib/util/tracing";
-import { User, StartPrebuildContext, Workspace, CommitContext, PrebuiltWorkspaceContext, WorkspaceContext, WithSnapshot, WithPrebuild } from "@gitpod/gitpod-protocol";
+import { User, StartPrebuildContext, Workspace, CommitContext, PrebuiltWorkspaceContext, WorkspaceContext, WithSnapshot, WithPrebuild, TaskConfig } from "@gitpod/gitpod-protocol";
 import { log } from '@gitpod/gitpod-protocol/lib/util/logging';
 import { LicenseEvaluator } from '@gitpod/licensor/lib';
 import { Feature } from '@gitpod/licensor/lib/api';
@@ -66,21 +66,37 @@ export class WorkspaceFactoryEE extends WorkspaceFactory {
                 if (!parentPrebuild) {
                     continue;
                 }
-                log.debug(`Considering parent prebuild for ${commitContext.revision}`, parentPrebuild);
                 if (parentPrebuild.state !== 'available') {
                     continue;
                 }
+                log.debug(`Considering parent prebuild for ${commitContext.revision}`, parentPrebuild);
                 const buildWorkspace = await this.db.trace({span}).findById(parentPrebuild.buildWorkspaceId);
                 if (!buildWorkspace) {
                     continue;
                 }
                 if (!!buildWorkspace.basedOnPrebuildId) {
                     continue;
                 }
-                if (buildWorkspace.imageSource !== imageSource) {
+                if (JSON.stringify(imageSource) !== JSON.stringify(buildWorkspace.imageSource)) {
+                    log.debug(`Skipping parent prebuild: Outdated image`, {
+                        imageSource,
+                        parentImageSource: buildWorkspace.imageSource,
+                    });
                     continue;
                 }
-                if (buildWorkspace.config.tasks !== config.tasks) {
+                const filterPrebuildTasks = (tasks: TaskConfig[] = []) => (tasks
+                    .map(task => Object.keys(task)
+                        .filter(key => ['before', 'init', 'prebuild'].includes(key))
+                        // @ts-ignore
+                        .reduce((obj, key) => ({ ...obj, [key]: task[key] }), {}))
+                    .filter(task => Object.keys(task).length > 0));
+                const prebuildTasks = filterPrebuildTasks(config.tasks);
+                const parentPrebuildTasks = filterPrebuildTasks(buildWorkspace.config.tasks);
+                if (JSON.stringify(prebuildTasks) !== JSON.stringify(parentPrebuildTasks)) {
+                    log.debug(`Skipping parent prebuild: Outdated prebuild tasks`, {
+                        prebuildTasks,
+                        parentPrebuildTasks,
+                    });
                     continue;
                 }
                 const incrementalPrebuildContext: PrebuiltWorkspaceContext = {

components/server/src/workspace/workspace-starter.ts

@@ -596,6 +596,7 @@ export class WorkspaceStarter {
             }
         }
         const initializerPromise = this.createInitializer(traceCtx, workspace, workspace.context, user);
+        // TODO: Longer timeout for full/parent prebuild? (if incremental prebuilds are enabled)
         const userTimeoutPromise = this.userService.getDefaultWorkspaceTimeout(user);
 
         const featureFlags = instance.configuration!.featureFlags || [];

components/ws-manager/pkg/manager/status.go

@@ -732,6 +732,7 @@ func (m *Manager) isWorkspaceTimedOut(wso workspaceObjects) (reason string, err
 
 	case api.WorkspacePhase_RUNNING:
 		if wso.IsWorkspaceHeadless() {
+			// TODO(janx): Longer-running parent prebuilds. Maybe honor `customTimeoutAnnotation` for headless workspaces too?
 			return decide(start, m.Config.Timeouts.HeadlessWorkspace, activityRunningHeadless)
 		} else if lastActivity == nil {
 			// the workspace is up and running, but the user has never produced any activity