Merge branches 'w/8.1/improvement/ARSN-21-Upgrade-Node-to-16' and 'q/1649/7.10/improvement/ARSN-21-Upgrade-Node-to-16' into tmp/octopus/q/8.1

Author: bert-e

.github/workflows/tests.yaml

@@ -28,10 +28,10 @@ jobs:
       uses: actions/checkout@v2
     - uses: actions/setup-node@v2
       with:
-        node-version: '10'
+        node-version: '16'
         cache: 'yarn'
     - name: install dependencies
-      run: yarn install --frozen-lockfile
+      run: yarn cache clean && yarn install --frozen-lockfile
     - name: lint yaml
       run: yarn --silent lint_yml
     - name: lint javascript

lib/network/probe/HealthProbeServer.js

@@ -38,10 +38,10 @@ class HealthProbeServer extends httpServer {
         const log = this.logging.newRequestLogger();
         log.debug('request received', { method: req.method,
             url: req.url });
+
         if (req.method !== 'GET') {
             sendError(res, log, errors.MethodNotAllowed);
-        }
-        if (req.url in this._reqHandlers) {
+        } else if (req.url in this._reqHandlers) {
             this._reqHandlers[req.url](req, res, log);
         } else {
             sendError(res, log, errors.InvalidURI);

lib/storage/data/file/DataFileStore.js

@@ -256,18 +256,15 @@ class DataFileStore {
                     { method: 'put', key, filePath, error: err });
                 // destroying the write stream forces a close(fd)
                 fileStream.destroy();
+                // we need to unlink the file ourselves
+                fs.stat(filePath, err => {
+                    if (!err) {
+                        fs.unlinkSync(filePath);
+                    }
+                });
                 return cbOnce(errors.InternalError.customizeDescription(
                     `read stream error: ${err.code}`));
             });
-            dataStream.on('close', () => {
-                // this means the underlying socket has been closed
-                log.debug('Client closed socket while streaming',
-                          { method: 'put', key, filePath });
-                // destroying the write stream forces a close(fd)
-                fileStream.destroy();
-                // we need to unlink the file ourselves
-                fs.unlinkSync(filePath);
-            });
             return undefined;
         });
     }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "arsenal",
   "engines": {
-    "node": ">=8"
+    "node": ">=16"
   },
   "version": "8.1.19",
   "description": "Common utilities for the S3 project components",
@@ -30,7 +30,7 @@
     "bson": "4.0.0",
     "debug": "~4.1.0",
     "diskusage": "^1.1.1",
-    "fcntl": "github:scality/node-fcntl",
+    "fcntl": "github:scality/node-fcntl#0.2.0",
     "hdclient": "scality/hdclient#489db2106570b9ea41bdacdf56131324d0db6a58",
     "https-proxy-agent": "^2.2.0",
     "ioredis": "4.9.5",
@@ -50,7 +50,7 @@
     "xml2js": "~0.4.23"
   },
   "optionalDependencies": {
-    "ioctl": "2.0.1"
+    "ioctl": "^2.0.2"
   },
   "devDependencies": {
     "@sinonjs/fake-timers": "^6.0.1",
@@ -68,7 +68,7 @@
     "lint": "eslint $(git ls-files '*.js')",
     "lint_md": "mdlint $(git ls-files '*.md')",
     "lint_yml": "yamllint $(git ls-files '*.yml')",
-    "test": "mocha --recursive --timeout 5500 --exit tests/unit",
+    "test": "mocha --recursive --exit tests/unit",
     "ft_test": "find tests/functional -name \"*.js\" | grep -v \"utils/\" | xargs mocha --timeout 120000 --exit",
     "coverage": "yarn coverage_unit && yarn coverage_ft && yarn coverage_report",
     "coverage_unit": "nyc --silent yarn test",

tests/unit/network/http/server.js

@@ -208,7 +208,7 @@ describe('network.Server: ', () => {
                 assert.strictEqual(ws._server._connections, 1);
                 setTimeout(() => {
                     // client connection should have been closed after more than 1000ms
-                    assert.strictEqual(ws._server.connections, 0);
+                    assert.strictEqual(ws._server._connections, 0);
                     ws.stop();
                     ws.onStop(done);
                 }, 200);

tests/unit/network/rest/index.js

@@ -115,10 +115,11 @@ describe('REST interface for blob data storage', () => {
                         assert(usage.total > 0);
                         subDone();
                     });
-                }],
-                         err => {
-                             done(err);
-                         });
+                },
+            ],
+            err => {
+                done(err);
+            });
         });
     });
 

tests/unit/storage/data/DummyService.js

@@ -42,6 +42,10 @@ class DummyGetObjectRequest {
     on() {
         return this;
     }
+
+    abort() {
+        return this;
+    }
 }
 
 class DummyService {