Revert commit of reuse storage clients

lib/file_transfer_agent/azure_util.js

@@ -89,7 +89,7 @@ function AzureUtil(azure, filestream) {
   */
   this.getFileHeader = async function (meta, filename) {
     const stageInfo = meta['stageInfo'];
-    const client = meta['client'];
+    const client = this.createClient(stageInfo);
     const azureLocation = this.extractContainerNameAndPath(stageInfo['location']);
 
     const containerClient = client.getContainerClient(azureLocation.containerName);
@@ -188,7 +188,7 @@ function AzureUtil(azure, filestream) {
     }
 
     const stageInfo = meta['stageInfo'];
-    const client = meta['client'];
+    const client = this.createClient(stageInfo);
     const azureLocation = this.extractContainerNameAndPath(stageInfo['location']);
     const blobName = azureLocation.path + meta['dstFileName'];
 
@@ -230,7 +230,7 @@ function AzureUtil(azure, filestream) {
   */
   this.nativeDownloadFile = async function (meta, fullDstPath) {
     const stageInfo = meta['stageInfo'];
-    const client = meta['client'];
+    const client = this.createClient(stageInfo);
     const azureLocation = this.extractContainerNameAndPath(stageInfo['location']);
     const blobName = azureLocation.path + meta['srcFileName'];
 

lib/file_transfer_agent/file_transfer_agent.js

@@ -148,12 +148,8 @@ function FileTransferAgent(context) {
       meta['requireCompress'] = false;
       meta['dstFileName'] = meta['srcFileName'];
 
-      storageClient = getStorageClient(meta['stageLocationType']);
-      try {
-        await storageClient.uploadOneFileStream(meta);
-      } finally {
-        storageClient.destroyClient(stageInfo, client);
-      }
+      var storageClient = getStorageClient(meta['stageLocationType']);
+      await storageClient.uploadOneFileStream(meta);
     } else {
       parseCommand();
       initFileMetadata();
@@ -308,16 +304,12 @@ function FileTransferAgent(context) {
       meta['client'] = client;
     }
 
-    try {
-      if (smallFileMetas.length > 0) {
-        //await uploadFilesinParallel(smallFileMetas);
-        await uploadFilesinSequential(smallFileMetas);
-      }
-      if (largeFileMetas.length > 0) {
-        await uploadFilesinSequential(largeFileMetas);
-      }
-    } finally {
-      storageClient.destroyClient(stageInfo, client);
+    if (smallFileMetas.length > 0) {
+      //await uploadFilesinParallel(smallFileMetas);
+      await uploadFilesinSequential(smallFileMetas);
+    }
+    if (largeFileMetas.length > 0) {
+      await uploadFilesinSequential(largeFileMetas);
     }
   }
 
@@ -426,16 +418,12 @@ function FileTransferAgent(context) {
       meta['client'] = client;
     }
 
-    try {
-      if (smallFileMetas.length > 0) {
-        //await downloadFilesinParallel(smallFileMetas);
-        await downloadFilesinSequential(smallFileMetas);
-      }
-      if (largeFileMetas.length > 0) {
-        await downloadFilesinSequential(largeFileMetas);
-      }
-    } finally {
-      storageClient.destroyClient(stageInfo, client);
+    if (smallFileMetas.length > 0) {
+      //await downloadFilesinParallel(smallFileMetas);
+      await downloadFilesinSequential(smallFileMetas);
+    }
+    if (largeFileMetas.length > 0) {
+      await downloadFilesinSequential(largeFileMetas);
     }
   }
 
@@ -514,18 +502,14 @@ function FileTransferAgent(context) {
       const client = SnowflakeRemoteStorageUtil.createClient(stageInfo, false);
       const s3location = SnowflakeS3Util.extractBucketNameAndPath(stageInfo['location']);
 
-      try {
-        await client.getBucketAccelerateConfiguration({ Bucket: s3location.bucketName })
-          .then(function (data) {
-            useAccelerateEndpoint = data['Status'] === 'Enabled';
-          }).catch(function (err) {
-            if (err['code'] === 'AccessDenied') {
-              return;
-            }
-          });
-      } finally {
-        SnowflakeRemoteStorageUtil.destroyClient(stageInfo, client);
-      }
+      await client.getBucketAccelerateConfiguration({ Bucket: s3location.bucketName })
+        .then(function (data) {
+          useAccelerateEndpoint = data['Status'] === 'Enabled';
+        }).catch(function (err) {
+          if (err['code'] === 'AccessDenied') {
+            return;
+          }
+        });
     }
   }
 

lib/file_transfer_agent/local_util.js

@@ -18,9 +18,6 @@ function LocalUtil() {
     return null;
   };
 
-  this.destroyClient = function () {
-  };
-
   /**
   * Write file to upload.
   *

lib/file_transfer_agent/remote_storage_util.js

@@ -65,19 +65,6 @@ function RemoteStorageUtil() {
     return utilClass.createClient(stageInfo, useAccelerateEndpoint);
   };
 
-  /**
-  * Destroys a client based on the location type.
-  *
-  * @param {Object} stageInfo
-  * @param {Object} client
-  */
-  this.destroyClient = function (stageInfo, client) {
-    const utilClass = this.getForStorageType(stageInfo['locationType']);
-    if (utilClass.destroyClient) {
-      utilClass.destroyClient(client);
-    }
-  };
-
   /**
    * Encrypt then upload one file stream.
    *

lib/file_transfer_agent/s3_util.js

@@ -76,15 +76,6 @@ function S3Util(s3, filestream) {
     return new AWS.S3(config);
   };
 
-  /**
-   * Destroys an AWS S3 client.
-   *
-   * @param {AWS.S3} client
-   */
-  this.destroyClient = function (client) {
-    client.destroy();
-  };
-
   /**
    * Extract the bucket name and path from the metadata's stage location.
    *
@@ -123,7 +114,7 @@ function S3Util(s3, filestream) {
    */
   this.getFileHeader = async function (meta, filename) {
     const stageInfo = meta['stageInfo'];
-    const client = meta['client'];
+    const client = this.createClient(stageInfo);
     const s3location = this.extractBucketNameAndPath(stageInfo['location']);
 
     const params = {
@@ -203,7 +194,8 @@ function S3Util(s3, filestream) {
       s3Metadata[AMZ_MATDESC] = encryptionMetadata.matDesc;
     }
 
-    const client = meta['client'];
+    const stageInfo = meta['stageInfo'];
+    const client = this.createClient(stageInfo);
 
     const s3location = this.extractBucketNameAndPath(meta['stageInfo']['location']);
 
@@ -243,7 +235,8 @@ function S3Util(s3, filestream) {
    * @param {Object} encryptionMetadata
    */
   this.nativeDownloadFile = async function (meta, fullDstPath) {
-    const client = meta['client'];
+    const stageInfo = meta['stageInfo'];
+    const client = this.createClient(stageInfo);
 
     const s3location = this.extractBucketNameAndPath(meta['stageInfo']['location']);
 

test/unit/file_transfer_agent/azure_test.js

@@ -20,8 +20,16 @@ describe('Azure client', function () {
   let Azure = null;
   let client = null;
   let filestream = null;
-  let meta = null;
   const dataFile = mockDataFile;
+  const dataFile = mockDataFile;
+  const meta = {
+    stageInfo: {
+      location: mockLocation,
+      path: mockTable + '/' + mockPath + '/',
+      creds: {}
+    },
+    SHA256_DIGEST: mockDigest,
+  };
   const encryptionMetadata = {
     key: mockKey,
     iv: mockIv,
@@ -101,18 +109,6 @@ describe('Azure client', function () {
     filestream = require('filestream');
     Azure = new SnowflakeAzureUtil(client, filestream);
   });
-  beforeEach(function () {
-    const stageInfo = {
-      location: mockLocation,
-      path: mockTable + '/' + mockPath + '/',
-      creds: {}
-    };
-    meta = {
-      stageInfo,
-      SHA256_DIGEST: mockDigest,
-      client: Azure.createClient(stageInfo),
-    };
-  });
 
   it('extract bucket name and path', async function () {
     verifyNameAndPath('sfc-eng-regression/test_sub_dir/', 'sfc-eng-regression', 'test_sub_dir/');
@@ -137,7 +133,6 @@ describe('Azure client', function () {
 
     client = require('client');
     Azure = new SnowflakeAzureUtil(client);
-    meta['client'] = Azure.createClient(meta['stageInfo']);
 
     await Azure.getFileHeader(meta, dataFile);
     assert.strictEqual(meta['resultStatus'], resultStatus.RENEW_TOKEN);
@@ -153,7 +148,6 @@ describe('Azure client', function () {
 
     client = require('client');
     const Azure = new SnowflakeAzureUtil(client);
-    meta['client'] = Azure.createClient(meta['stageInfo']);
 
     await Azure.getFileHeader(meta, dataFile);
     assert.strictEqual(meta['resultStatus'], resultStatus.NOT_FOUND_FILE);
@@ -169,7 +163,6 @@ describe('Azure client', function () {
 
     client = require('client');
     Azure = new SnowflakeAzureUtil(client);
-    meta['client'] = Azure.createClient(meta['stageInfo']);
 
     await Azure.getFileHeader(meta, dataFile);
     assert.strictEqual(meta['resultStatus'], resultStatus.RENEW_TOKEN);
@@ -185,7 +178,6 @@ describe('Azure client', function () {
 
     client = require('client');
     Azure = new SnowflakeAzureUtil(client);
-    meta['client'] = Azure.createClient(meta['stageInfo']);
 
     await Azure.getFileHeader(meta, dataFile);
     assert.strictEqual(meta['resultStatus'], resultStatus.ERROR);
@@ -202,7 +194,6 @@ describe('Azure client', function () {
     client = require('client');
     filestream = require('filestream');
     Azure = new SnowflakeAzureUtil(client, filestream);
-    meta['client'] = Azure.createClient(meta['stageInfo']);
 
     await Azure.uploadFile(dataFile, meta, encryptionMetadata);
     assert.strictEqual(meta['resultStatus'], resultStatus.UPLOADED);
@@ -223,7 +214,6 @@ describe('Azure client', function () {
     client = require('client');
     filestream = require('filestream');
     Azure = new SnowflakeAzureUtil(client, filestream);
-    meta['client'] = Azure.createClient(meta['stageInfo']);
 
     await Azure.uploadFile(dataFile, meta, encryptionMetadata);
     assert.strictEqual(meta['resultStatus'], resultStatus.RENEW_TOKEN);
@@ -244,7 +234,6 @@ describe('Azure client', function () {
     client = require('client');
     filestream = require('filestream');
     Azure = new SnowflakeAzureUtil(client, filestream);
-    meta['client'] = Azure.createClient(meta['stageInfo']);
 
     await Azure.uploadFile(dataFile, meta, encryptionMetadata);
     assert.strictEqual(meta['resultStatus'], resultStatus.NEED_RETRY);