[server] Make redis client reusable, stop creating new one on each mutex WEB-230 (#17384)

* [server] Make redis client reusable

* fix

* fix

Author: easyCZ

components/server/src/container-module.ts

@@ -125,7 +125,8 @@ import { BitbucketAppSupport } from "./bitbucket/bitbucket-app-support";
 import { GitHubEnterpriseApp } from "./prebuilds/github-enterprise-app";
 import { BitbucketServerApp } from "./prebuilds/bitbucket-server-app";
 import { IncrementalPrebuildsService } from "./prebuilds/incremental-prebuilds-service";
-import { RedisMutex } from "./mutex/redlock";
+import { RedisClient } from "./redis/client";
+import { RedisMutex } from "./redis/mutex";
 
 export const productionContainerModule = new ContainerModule((bind, unbind, isBound, rebind) => {
     bind(Config).toConstantValue(ConfigFile.fromFile());
@@ -345,5 +346,6 @@ export const productionContainerModule = new ContainerModule((bind, unbind, isBo
     bind(BitbucketServerApp).toSelf().inSingletonScope();
     bind(IncrementalPrebuildsService).toSelf().inSingletonScope();
 
+    bind(RedisClient).toSelf().inSingletonScope();
     bind(RedisMutex).toSelf().inSingletonScope();
 });

components/server/src/redis/client.ts

@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2023 Gitpod GmbH. All rights reserved.
+ * Licensed under the GNU Affero General Public License (AGPL).
+ * See License.AGPL.txt in the project root for license information.
+ */
+
+import { inject, injectable, postConstruct } from "inversify";
+import { Redis } from "ioredis";
+import { Config } from "../config";
+
+@injectable()
+export class RedisClient {
+    @inject(Config) protected config: Config;
+
+    private client: Redis;
+
+    @postConstruct()
+    protected initialize(): void {
+        const [host, port] = this.config.redis.address.split(":");
+        this.client = new Redis({
+            port: Number(port),
+            host,
+            enableReadyCheck: true,
+            keepAlive: 10 * 1000,
+            connectionName: "server",
+        });
+    }
+
+    public get(): Redis {
+        return this.client;
+    }
+}

components/server/src/mutex/redlock.ts renamed to components/server/src/redis/mutex.ts

@@ -5,22 +5,15 @@
  */
 
 import { inject, injectable } from "inversify";
-import { Config } from "../config";
-import { Redis as RedisClient } from "ioredis";
 import Redlock from "redlock";
+import { RedisClient } from "./client";
 
 @injectable()
 export class RedisMutex {
-    @inject(Config) protected config: Config;
+    @inject(RedisClient) protected redis: RedisClient;
 
     public client(): Redlock {
-        const [host, port] = this.config.redis.address.split(":");
-        const redis = new RedisClient({
-            port: Number(port),
-            host,
-            enableReadyCheck: true,
-        });
-        return new Redlock([redis], {
+        return new Redlock([this.redis.get()], {
             // The expected clock drift; for more details see:
             // http://redis.io/topics/distlock
             driftFactor: 0.01, // multiplied by lock ttl to determine drift time

components/server/src/workspace/garbage-collector.ts

@@ -13,8 +13,8 @@ import { TracedWorkspaceDB, DBWithTracing, WorkspaceDB } from "@gitpod/gitpod-db
 import { TraceContext } from "@gitpod/gitpod-protocol/lib/util/tracing";
 import { Config } from "../config";
 import { repeat } from "@gitpod/gitpod-protocol/lib/util/repeat";
-import { RedisMutex } from "../mutex/redlock";
 import { ResourceLockedError } from "redlock";
+import { RedisMutex } from "../redis/mutex";
 
 /**
  * The WorkspaceGarbageCollector has two tasks: