S3UTILS-112: enforce proper usage of maxsockets

Author: williamlardier

CompareRaftMembers/BucketStream.js

@@ -1,10 +1,11 @@
 const async = require('async');
 const http = require('http');
+const { http: httpArsn } = require('httpagent');
 const stream = require('stream');
 
 const { versioning } = require('arsenal');
 
-const httpAgent = new http.Agent({
+const httpAgent = new httpArsn.Agent({
     keepAlive: true,
 });
 

CompareRaftMembers/DiffStreamOplogFilter.js

@@ -1,14 +1,15 @@
 const async = require('async');
 const http = require('http');
 const stream = require('stream');
+const { http: httpArsn } = require('httpagent');
 
 const RaftOplogStream = require('./RaftOplogStream');
 
 const DEFAULT_MAX_BUFFERED_ENTRIES = 10000;
 const DEFAULT_RETRY_DELAY_MS = 1000;
 const DEFAULT_MAX_RETRY_DELAY_MS = 10000;
 
-const httpAgent = new http.Agent({
+const httpAgent = new httpArsn.Agent({
     keepAlive: true,
 });
 

CompareRaftMembers/RaftOplogStream.js

@@ -1,13 +1,14 @@
 const async = require('async');
 const http = require('http');
 const stream = require('stream');
+const { http: httpArsn } = require('httpagent');
 
 const DEFAULT_REFRESH_PERIOD_MS = 5000;
 const DEFAULT_MAX_RECORDS_PER_REQUEST = 1000;
 const DEFAULT_RETRY_DELAY_MS = 1000;
 const DEFAULT_MAX_RETRY_DELAY_MS = 10000;
 
-const httpAgent = new http.Agent({
+const httpAgent = new httpArsn.Agent({
     keepAlive: true,
 });
 

CompareRaftMembers/repairObjects.js

@@ -3,6 +3,7 @@
 const async = require('async');
 const http = require('http');
 const jsonStream = require('JSONStream');
+const { http: httpArsn } = require('httpagent');
 
 const { Logger } = require('werelogs');
 const { jsutil, errors, versioning } = require('arsenal');
@@ -60,7 +61,7 @@ const countByStatus = {
     UpdatedByClient: 0,
 };
 
-const httpAgent = new http.Agent({
+const httpAgent = new httpArsn.Agent({
     keepAlive: true,
 });
 

bucketVersionsStats.js

@@ -1,6 +1,5 @@
 const fs = require('fs');
-const http = require('http');
-const https = require('https');
+const { http, https } = require('httpagent');
 
 const AWS = require('aws-sdk');
 const { doWhilst } = require('async');

cleanupBuckets.js

@@ -1,4 +1,5 @@
-const http = require('http');
+const { http } = require('httpagent');
+
 const async = require('async');
 const AWS = require('aws-sdk');
 const { Logger } = require('werelogs');

cleanupNoncurrentVersions.js

@@ -1,6 +1,5 @@
 const fs = require('fs');
-const http = require('http');
-const https = require('https');
+const { http, https } = require('httpagent');
 
 const AWS = require('aws-sdk');
 const { doWhilst, eachSeries } = require('async');

compareBuckets/utils.js

@@ -1,10 +1,11 @@
 const http = require('http');
 const async = require('async');
 const { URL } = require('url');
+const { http: httpArsn } = require('httpagent');
 
 const { jsutil } = require('arsenal');
 
-const httpAgent = new http.Agent({
+const httpAgent = new httpArsn.Agent({
     keepAlive: true,
 });
 

listFailedObjects.js

@@ -1,6 +1,6 @@
 const async = require('async');
 const AWS = require('aws-sdk');
-const http = require('http');
+const { http } = require('httpagent');
 
 const { Logger } = require('werelogs');
 

removeDeleteMarkers.js

@@ -1,7 +1,7 @@
 /* eslint-disable max-len */
 /* eslint-disable no-console */
 
-const http = require('http');
+const { http } = require('httpagent');
 const async = require('async');
 const AWS = require('aws-sdk');
 const { Logger } = require('werelogs');

repairDuplicateVersionsSuite.js

@@ -7,6 +7,8 @@ const crypto = require('crypto');
 const fs = require('fs');
 const http = require('http');
 const https = require('https');
+const { http: httpArsn, https: httpsArsn } = require('httpagent');
+
 const { URL } = require('url');
 const readline = require('readline');
 
@@ -33,15 +35,15 @@ const sproxydAgent = new http.Agent({
 });
 
 const bucketdAgent = useHttps
-    ? new https.Agent({
+    ? new httpsArsn.Agent({
         key: fs.readFileSync(OBJECT_REPAIR_TLS_KEY_PATH),
         cert: fs.readFileSync(OBJECT_REPAIR_TLS_CERT_PATH),
         ca: OBJECT_REPAIR_TLS_CA_PATH
             ? [fs.readFileSync(OBJECT_REPAIR_TLS_CA_PATH)]
             : undefined,
         keepAlive: true,
     })
-    : new http.Agent({
+    : new httpArsn.Agent({
         keepAlive: true,
     });
 

requeueFailedCRRCronJob.js

@@ -2,6 +2,7 @@ const {
     waterfall, doWhilst, eachLimit, retry,
 } = require('async');
 const http = require('http');
+const { http: httpArsn } = require('httpagent');
 const { Producer } = require('node-rdkafka');
 const { scheduleJob } = require('node-schedule');
 
@@ -65,7 +66,7 @@ const bbOptions = {
     signatureCache: false,
     httpOptions: {
         timeout: 0,
-        agent: new http.Agent({ keepAlive: true }),
+        agent: new httpArsn.Agent({ keepAlive: true }),
     },
 };
 

verifyBucketSproxydKeys.js

@@ -3,6 +3,7 @@
 /* eslint-disable comma-dangle */
 
 const http = require('http');
+const { http: httpArsn } = require('httpagent');
 const async = require('async');
 const { URL } = require('url');
 const jsonStream = require('JSONStream');
@@ -128,7 +129,7 @@ if (!SPROXYD_HOSTPORT && !NO_MISSING_KEY_CHECK) {
 
 const log = new Logger('s3utils:verifyBucketSproxydKeys');
 
-const httpAgent = new http.Agent({
+const httpAgent = new httpArsn.Agent({
     keepAlive: true,
 });