fix up

Author: easyCZ

components/gitpod-db/src/typeorm/entity/db-prebuilt-workspace-updatable.ts

@@ -59,4 +59,8 @@ export class DBPrebuiltWorkspaceUpdatable implements PrebuiltWorkspaceUpdatable
         transformer: Transformer.MAP_EMPTY_STR_TO_UNDEFINED,
     })
     label?: string;
+
+    // This column triggers the db-sync deletion mechanism. It's not intended for public consumption.
+    @Column()
+    deleted?: boolean;
 }

components/gitpod-db/src/typeorm/entity/db-prebuilt-workspace.ts

@@ -77,4 +77,8 @@ export class DBPrebuiltWorkspace implements PrebuiltWorkspace {
         transformer: Transformer.MAP_BIGINT_TO_NUMBER,
     })
     statusVersion: number;
+
+    // This column triggers the db-sync deletion mechanism. It's not intended for public consumption.
+    @Column()
+    deleted?: boolean;
 }

components/gitpod-db/src/typeorm/metrics.ts

@@ -16,7 +16,6 @@ export function registerDBMetrics(registry: prometheusClient.Registry) {
 const workspacesPurgedTotal = new prometheusClient.Counter({
     name: "gitpod_server_workspaces_purged_total",
     help: "Counter of workspaces hard deleted by periodic gc.",
-    registers: [prometheusClient.register],
 });
 
 export function reportWorkspacePurged(count: number) {
@@ -26,7 +25,6 @@ export function reportWorkspacePurged(count: number) {
 const prebuildWorkspacesPurgedTotal = new prometheusClient.Counter({
     name: "gitpod_server_prebuild_workspaces_purged_total",
     help: "Counter of prebuild workspaces hard deleted by periodic gc.",
-    registers: [prometheusClient.register],
 });
 
 export function reportPrebuiltWorkspacePurged(count: number) {
@@ -36,7 +34,6 @@ export function reportPrebuiltWorkspacePurged(count: number) {
 const prebuildInfoPurgedTotal = new prometheusClient.Counter({
     name: "gitpod_server_prebuild_info_purged_total",
     help: "Counter of prebuild info records hard deleted by periodic gc.",
-    registers: [prometheusClient.register],
 });
 
 export function reportPrebuildInfoPurged(count: number) {
@@ -46,9 +43,17 @@ export function reportPrebuildInfoPurged(count: number) {
 const workspaceInstancePurgedTotal = new prometheusClient.Counter({
     name: "gitpod_server_workspace_instances_purged_total",
     help: "Counter of workspace instances records hard deleted by periodic gc.",
-    registers: [prometheusClient.register],
 });
 
 export function reportWorkspaceInstancePurged(count: number) {
     workspaceInstancePurgedTotal.inc(count);
 }
+
+const prebuiltWorkspaceUpdatablePurgedTotal = new prometheusClient.Counter({
+    name: "gitpod_server_prebuilt_workspace_updatable_purged_total",
+    help: "Counter of prebuilt workspace updatable records hard deleted by periodic gc.",
+});
+
+export function reportPrebuiltWorkspaceUpdatablePurged(count: number) {
+    prebuiltWorkspaceUpdatablePurgedTotal.inc(count);
+}

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

@@ -56,6 +56,7 @@ import { daysBefore } from "@gitpod/gitpod-protocol/lib/util/timeutil";
 import {
     reportPrebuildInfoPurged,
     reportPrebuiltWorkspacePurged,
+    reportPrebuiltWorkspaceUpdatablePurged,
     reportWorkspaceInstancePurged,
     reportWorkspacePurged,
 } from "./metrics";
@@ -990,14 +991,15 @@ export abstract class AbstractTypeORMWorkspaceDBImpl implements WorkspaceDB {
         const prebuild = await this.findPrebuildByWorkspaceID(workspaceId);
         if (prebuild !== undefined) {
             // There are prebuilds linked to this workspace. We need to delete these first.
-            // `d_b_workspace_prebuild doens't have a deleted column for db-sync
-            // const prebuildsDeleted = await (
-            //     await this.getPrebuiltWorkspaceRepo()
-            // ).update({ id: prebuild.id }, { deleted: true });
-            // reportPrebuiltWorkspacePurged(prebuildsDeleted.affected || 0);
-
-            // Delete the d_b_prebuilt_workspace_updatable record?
-            // await (await this.getPrebuiltWorkspaceUpdatableRepo()).update()
+            const prebuildsDeleted = await (
+                await this.getPrebuiltWorkspaceRepo()
+            ).update({ id: prebuild.id }, { deleted: true });
+            reportPrebuiltWorkspacePurged(prebuildsDeleted.affected || 0);
+
+            const updatableDeletes = await (
+                await this.getPrebuiltWorkspaceUpdatableRepo()
+            ).update({ id: prebuild.id }, { deleted: true });
+            reportPrebuiltWorkspaceUpdatablePurged(updatableDeletes.affected || 0);
 
             const prebuildInfos = await (
                 await this.getPrebuildInfoRepo()