Merge pull request #3808 from RedisInsight/be/bugfix/RI-6095-enhance-client-conn-config

disable ready-check

Author: mariasergeenko

redisinsight/api/src/modules/database/database.service.spec.ts

@@ -555,6 +555,7 @@ describe('DatabaseService', () => {
             privateKey: null,
           },
         },
+        {},
       );
     });
 
@@ -590,6 +591,7 @@ describe('DatabaseService', () => {
             passphrase: 'ssh-passphrase',
           },
         },
+        {},
       );
     });
 
@@ -621,6 +623,7 @@ describe('DatabaseService', () => {
             name: 'name',
           },
         },
+        {},
       );
     });
 
@@ -650,6 +653,7 @@ describe('DatabaseService', () => {
             id: 'new id',
           },
         },
+        {},
       );
     });
 

redisinsight/api/src/modules/database/database.service.ts

@@ -23,7 +23,7 @@ import { ExportDatabase } from 'src/modules/database/models/export-database';
 import { deepMerge } from 'src/common/utils';
 import { CaCertificate } from 'src/modules/certificate/models/ca-certificate';
 import { ClientCertificate } from 'src/modules/certificate/models/client-certificate';
-import { RedisClientFactory } from 'src/modules/redis/redis.client.factory';
+import { IRedisConnectionOptions, RedisClientFactory } from 'src/modules/redis/redis.client.factory';
 import { RedisClientStorage } from 'src/modules/redis/redis.client.storage';
 
 @Injectable()
@@ -149,15 +149,25 @@ export class DatabaseService {
    * @param sessionMetadata
    * @param dto
    * @param uniqueCheck
+   * @param options
    */
-  async create(sessionMetadata: SessionMetadata, dto: CreateDatabaseDto, uniqueCheck = false): Promise<Database> {
+  async create(
+    sessionMetadata: SessionMetadata,
+    dto: CreateDatabaseDto,
+    uniqueCheck = false,
+    options: IRedisConnectionOptions = {},
+  ): Promise<Database> {
     try {
       this.logger.log('Creating new database.');
 
       const database = await this.repository.create(
         sessionMetadata,
         {
-          ...await this.databaseFactory.createDatabaseModel(sessionMetadata, classToClass(Database, dto)),
+          ...await this.databaseFactory.createDatabaseModel(
+            sessionMetadata,
+            classToClass(Database, dto),
+            options,
+          ),
           new: true,
         },
         uniqueCheck,

redisinsight/api/src/modules/database/providers/database.factory.ts

@@ -9,7 +9,7 @@ import { DatabaseInfoProvider } from 'src/modules/database/providers/database-in
 import { RedisErrorCodes } from 'src/constants';
 import { CaCertificateService } from 'src/modules/certificate/ca-certificate.service';
 import { ClientCertificateService } from 'src/modules/certificate/client-certificate.service';
-import { RedisClientFactory } from 'src/modules/redis/redis.client.factory';
+import { IRedisConnectionOptions, RedisClientFactory } from 'src/modules/redis/redis.client.factory';
 import {
   discoverClusterNodes, discoverSentinelMasterGroups, isCluster, isSentinel,
 } from 'src/modules/redis/utils';
@@ -28,9 +28,15 @@ export class DatabaseFactory {
 
   /**
    * Create model
+   * @param sessionMetadata
    * @param database
+   * @param options
    */
-  async createDatabaseModel(sessionMetadata: SessionMetadata, database: Database): Promise<Database> {
+  async createDatabaseModel(
+    sessionMetadata: SessionMetadata,
+    database: Database,
+    options: IRedisConnectionOptions = {},
+  ): Promise<Database> {
     let model = await this.createStandaloneDatabaseModel(database);
 
     const client = await this.redisClientFactory.getConnectionStrategy().createStandaloneClient(
@@ -40,7 +46,7 @@ export class DatabaseFactory {
         context: ClientContext.Common,
       },
       database,
-      { useRetry: true },
+      { ...options, useRetry: true },
     );
 
     if (!HostingProvider[model.provider]) {

redisinsight/api/src/modules/redis-sentinel/redis-sentinel.service.ts

@@ -84,6 +84,8 @@ export class RedisSentinelService {
                 password,
               },
             } as Database,
+            undefined,
+            { enableReadyCheck: false },
           );
 
           result.push({
@@ -124,7 +126,7 @@ export class RedisSentinelService {
         sessionMetadata: this.constantsProvider.getSystemSessionMetadata(),
         databaseId: database.id || uuidv4(),
         context: ClientContext.Common,
-      }, database, { useRetry: false });
+      }, database, { useRetry: false, enableReadyCheck: false });
       result = await discoverSentinelMasterGroups(client);
       this.redisSentinelAnalytics.sendGetSentinelMastersSucceedEvent(result);
 

redisinsight/api/src/modules/redis/connection/ioredis.redis.connection.strategy.ts

@@ -60,6 +60,7 @@ export class IoredisRedisConnectionStrategy extends RedisConnectionStrategy {
       maxRetriesPerRequest: REDIS_CLIENTS_CONFIG.maxRetriesPerRequest,
       retryStrategy: options?.useRetry ? this.retryStrategy.bind(this) : this.dummyFn.bind(this),
       autoResendUnfulfilledCommands: false,
+      enableReadyCheck: options.enableReadyCheck ?? true,
     };
 
     if (tls) {

redisinsight/api/src/modules/redis/redis.client.factory.ts

@@ -22,6 +22,7 @@ export interface IRedisConnectionOptions {
   useRetry?: boolean,
   connectionName?: string,
   clientLib?: RedisClientLib,
+  enableReadyCheck?: boolean,
 }
 
 @Injectable()