[db] Remove DeletedEntryGC and all references

Author: geropl

.werft/jobs/build/payment/payment-endpoint-deployment.yaml

@@ -61,8 +61,6 @@ spec:
             secretKeyRef:
               key: encryptionKeys
               name: mysql
-        - name: DB_DELETED_ENTRIES_GC_ENABLED
-          value: "false"
         - name: CHARGEBEE_WEBHOOK
           value: '{"id":"whv2_Hr55137RIX0bgV1e96","password":"0\"cR4M,;nV=$m9izAHEah","user":"chargebee"}'
         - name: GITPOD_GITHUB_APP_ENABLED
@@ -146,5 +144,3 @@ spec:
       - name: chargebee-config
         secret:
           secretName: chargebee-config
-
-

components/gitpod-db/src/config.ts

@@ -40,12 +40,6 @@ export class Config {
     get dbEncryptionKeys(): string {
         return getEnvVar("DB_ENCRYPTION_KEYS");
     }
-
-    get deletedEntryGCConfig(): DeletedEntryGCConfig {
-        const enabled = getEnvVar("DB_DELETED_ENTRIES_GC_ENABLED", "true") === "true";
-        const intervalMS = parseInt(getEnvVar("DB_DELETED_ENTRIES_GC_INTERVAL", (10 * 60 * 1000).toString()));
-        return { enabled, intervalMS };
-    }
 }
 
 export interface DatabaseConfig {
@@ -55,8 +49,3 @@ export interface DatabaseConfig {
     username?: string;
     password?: string;
 }
-
-export interface DeletedEntryGCConfig {
-    enabled: boolean;
-    intervalMS: number;
-}

components/gitpod-db/src/container-module.ts

@@ -20,7 +20,6 @@ import { encryptionModule } from "@gitpod/gitpod-protocol/lib/encryption/contain
 import { KeyProviderImpl, KeyProviderConfig } from "@gitpod/gitpod-protocol/lib/encryption/key-provider";
 import { DBWithTracing, bindDbWithTracing, TracedWorkspaceDB, TracedUserDB, TracedOneTimeSecretDB } from "./traced-db";
 import { OneTimeSecretDB } from "./one-time-secret-db";
-import { DeletedEntryGC } from "./typeorm/deleted-entry-gc";
 import { TypeORMAppInstallationDBImpl } from "./typeorm/app-installation-db-impl";
 import { AppInstallationDB } from "./app-installation-db";
 import { TheiaPluginDBImpl } from "./typeorm/theia-plugin-db-impl";
@@ -71,7 +70,6 @@ export const dbContainerModule = new ContainerModule((bind, unbind, isBound, reb
     bind(TypeORM).toSelf().inSingletonScope();
     bind(DBWithTracing).toSelf().inSingletonScope();
     bind(TransactionalWorkspaceDbImpl).toSelf().inSingletonScope();
-    bind(DeletedEntryGC).toSelf().inSingletonScope();
 
     bind(TypeORMUserDBImpl).toSelf().inSingletonScope();
     bind(UserDB).toService(TypeORMUserDBImpl);

components/gitpod-db/src/index.ts

@@ -15,7 +15,6 @@ export * from "./typeorm/transformer";
 export * from "./typeorm/typeorm";
 export * from "./typeorm/user-db-impl";
 export * from "./typeorm/code-sync-resource-db";
-export * from "./typeorm/deleted-entry-gc";
 export * from "./periodic-deleter";
 export * from "./user-db";
 export * from "./workspace-db";

components/gitpod-db/src/tables.ts

@@ -43,12 +43,6 @@ export class GitpodSessionTableDescriptionProvider implements TableDescriptionPr
     }
 }
 
-/**
- * BEWARE
- *
- * When updating this list, make sure you update the deleted-entry-gc.ts in gitpod-db
- * as well, if you're adding a table that needs some of its entries deleted.
- */
 @injectable()
 export class GitpodTableDescriptionProvider implements TableDescriptionProvider {
     readonly name = "gitpod";
@@ -268,12 +262,6 @@ export class GitpodTableDescriptionProvider implements TableDescriptionProvider
             deletionColumn: "deleted",
             timeColumn: "_lastModified",
         },
-        /**
-         * BEWARE
-         *
-         * When updating this list, make sure you update the deleted-entry-gc.ts in gitpod-db
-         * as well, if you're adding a table that needs some of its entries deleted.
-         */
     ];
 
     public getSortedTables(): TableDescription[] {

components/gitpod-db/src/typeorm/deleted-entry-gc.ts

@@ -29,7 +29,7 @@ import { WorkspaceGarbageCollector } from "./workspace/garbage-collector";
 import { WorkspaceDownloadService } from "./workspace/workspace-download-service";
 import { MonitoringEndpointsApp } from "./monitoring-endpoints";
 import { WebsocketConnectionManager } from "./websocket/websocket-connection-manager";
-import { DeletedEntryGC, PeriodicDbDeleter, TypeORM } from "@gitpod/gitpod-db/lib";
+import { PeriodicDbDeleter, TypeORM } from "@gitpod/gitpod-db/lib";
 import { OneTimeSecretServer } from "./one-time-secret-server";
 import { Disposable, DisposableCollection, GitpodClient, GitpodServer } from "@gitpod/gitpod-protocol";
 import { BearerAuth, isBearerAuthError } from "./auth/bearer-authenticator";
@@ -72,7 +72,6 @@ export class Server<C extends GitpodClient, S extends GitpodServer> {
     @inject(RabbitMQConsensusLeaderMessenger) protected readonly consensusMessenger: RabbitMQConsensusLeaderMessenger;
     @inject(ConsensusLeaderQorum) protected readonly qorum: ConsensusLeaderQorum;
     @inject(WorkspaceGarbageCollector) protected readonly workspaceGC: WorkspaceGarbageCollector;
-    @inject(DeletedEntryGC) protected readonly deletedEntryGC: DeletedEntryGC;
     @inject(OneTimeSecretServer) protected readonly oneTimeSecretServer: OneTimeSecretServer;
 
     @inject(PeriodicDbDeleter) protected readonly periodicDbDeleter: PeriodicDbDeleter;
@@ -267,9 +266,6 @@ export class Server<C extends GitpodClient, S extends GitpodServer> {
         // Start workspace garbage collector
         this.workspaceGC.start().catch((err) => log.error("wsgc: error during startup", err));
 
-        // Start deleted entry GC
-        this.deletedEntryGC.start();
-
         // Start one-time secret GC
         this.oneTimeSecretServer.startPruningExpiredSecrets();
 

components/server/src/server.ts

@@ -258,10 +258,6 @@ func DatabaseEnv(cfg *config.Config) (res []corev1.EnvVar) {
 				Key:                  "encryptionKeys",
 			}},
 		},
-		corev1.EnvVar{
-			Name:  "DB_DELETED_ENTRIES_GC_ENABLED",
-			Value: "false",
-		},
 	)
 
 	return envvars