Merge remote-tracking branch 'origin/w/8.8/improvement/CLDSRV-648-kmipretry' into w/9.0/improvement/CLDSRV-648-kmipretry

Author: BourgoisMickael

lib/Config.js

@@ -719,6 +719,7 @@ class Config extends EventEmitter {
                 process.env.S3KMIP_BUCKET_ATTRIBUTE_NAME || '',
             },
             transport: this._parseKmipTransport({}),
+            retries: 0,
         };
         if (config.kmip) {
             assert(config.kmip.providerName, 'config.kmip.providerName must be defined');
@@ -743,6 +744,14 @@ class Config extends EventEmitter {
                 if (Array.isArray(config.kmip.transport)) {
                     this.kmip.transport = config.kmip.transport.map(t =>
                         this._parseKmipTransport(t));
+                    if (config.kmip.retries) {
+                        assert(typeof config.kmip.retries === 'number',
+                            'bad config: KMIP Cluster retries must be a number');
+                        assert(config.kmip.retries <= this.kmip.transport.length - 1,
+                            'bad config: KMIP Cluster retries must be lower or equal to the number of hosts - 1');
+                    } else {
+                        this.kmip.retries = this.kmip.transport.length - 1;
+                    }
                 } else {
                     this.kmip.transport =
                         this._parseKmipTransport(config.kmip.transport);

lib/kms/wrapper.js

@@ -52,7 +52,7 @@ const kmsFactory = {
             throw new Error('KMIP KMS driver configuration is missing.');
         }
         const client = Array.isArray(config.kmip.transport)
-            ? new KMIPClusterClient({ kmip: config.kmip })
+            ? new KMIPClusterClient({ kmip: config.kmip, logger, retries: config.kmip.retries })
             : new KMIPClient({ kmip: config.kmip });
         return { client, implName: 'kmip' };
     },