Fail healthchecks if any on multiple data backends fail

DOCKER.md

@@ -130,7 +130,7 @@ First add a new key-value pair in the restEndpoints section of your config.json.
 The key in the key-value pair should be the host name you would like to add
 and the value is the default location_constraint for this endpoint.
 
-For example, `s3.example.com` is mapping to `scality-us-west-1` which is one of
+For example, `s3.example.com` is mapped to `us-east-1` which is one of
 the `location_constraints` listed in your locationConfig.json file
 [here](https://github.com/scality/S3/blob/master/locationConfig.json).
 
@@ -142,7 +142,7 @@ More information about location configuration
     "localhost": "file",
     "127.0.0.1": "file",
     ...
-    "s3.example.com": "scality-us-west-1"
+    "s3.example.com": "us-east-1"
 },
 ```
 

config.json

@@ -4,9 +4,9 @@
     "restEndpoints": {
         "localhost": "file",
         "127.0.0.1": "file",
-        "s3.docker.test": "scality-us-west-1",
-        "127.0.0.2": "scality-us-west-1",
-        "s3.amazonaws.com": "scality-us-west-1"
+        "s3.docker.test": "us-east-1",
+        "127.0.0.2": "us-east-1",
+        "s3.amazonaws.com": "us-east-1"
     },
     "websiteEndpoints": ["s3-website-us-east-1.amazonaws.com",
                         "s3-website.us-east-2.amazonaws.com",

lib/data/wrapper.js

@@ -186,7 +186,7 @@ const data = {
             return cb(null, defResp);
         }
         return client.healthcheck(log, (err, result) => {
-            const respBody = {};
+            let respBody = {};
             if (err) {
                 log.error(`error from ${implName}`, { error: err });
                 respBody[implName] = {
@@ -197,7 +197,7 @@ const data = {
                 return cb(null, respBody);
             }
             if (implName === 'multipleBackends') {
-                respBody.dataBackends = result;
+                respBody = result;
                 return cb(null, respBody);
             }
             respBody[implName] = {

lib/utilities/healthcheckHandler.js

@@ -43,7 +43,10 @@ export function clientCheck(log, cb) {
     });
     async.parallel(clientTasks, (err, results) => {
         let fail = false;
-        // makes S3 return 500 error if any backend fails
+        // obj will be an object of the healthcheck results of
+        // every backends. No errors were returned directly to
+        // async.parallel in order to complete the check, so a
+        // manual check makes S3 return 500 error if any backend failed
         const obj = results.reduce((obj, item) => Object.assign(obj, item), {});
         fail = Object.keys(obj).some(k => obj[k].error);
         if (fail) {

locationConfig.json

@@ -1,27 +1,4 @@
 {
-    "scality-us-east-1": {
-        "type": "scality",
-        "legacyAwsBehavior": true,
-        "details": {
-            "connector": {
-                "sproxyd": {
-                    "bootstrap": ["localhost:8181"]
-                }
-            }
-        }
-    },
-    "scality-us-west-1": {
-        "type": "scality",
-        "legacyAwsBehavior": false,
-        "details": {
-            "connector": {
-                "sproxyd": {
-                    "bootstrap": ["localhost:8182"],
-                    "path": "/proxy/arc/"
-                }
-            }
-        }
-    },
     "us-east-1": {
         "type": "file",
         "legacyAwsBehavior": true,
@@ -41,5 +18,10 @@
         "type": "mem",
         "legacyAwsBehavior": false,
         "details": {}
+    },
+    "scality-us-west-1": {
+        "type": "mem",
+        "legacyAwsBehavior": false,
+        "details": {}
     }
 }

tests/multipleBackend/backendHealthcheckResponse.js

@@ -10,20 +10,18 @@ const log = new DummyRequestLogger();
 const locConstraints = Object.keys(config.locationConstraints);
 
 describe('Healthcheck response', () => {
-    it('should return object containing dataBackends key', done => {
-        clientCheck(log, (err, results) => {
-            assert.strictEqual(err, null, `Unexpected error ${err}`);
-            assert.notEqual(
-                Object.keys(results).indexOf('dataBackends'), -1);
+    it('should return no error', done => {
+        clientCheck(log, err => {
+            assert.strictEqual(err, null,
+                `Expected success but got error ${err}`);
             done();
         });
     });
     it('should return result for every location constraint in ' +
     'locationConfig', done => {
         clientCheck(log, (err, results) => {
-            assert.strictEqual(err, null, `Unexpected error ${err}`);
             locConstraints.forEach(constraint => {
-                assert.notEqual(Object.keys(results.dataBackends).
+                assert.notEqual(Object.keys(results).
                     indexOf(constraint), -1);
             });
             done();

tests/unit/api/multipartDelete.js

@@ -34,7 +34,7 @@ const initiateRequest = {
     url: `/${objectKey}?uploads`,
 };
 const eastLocation = 'us-east-1';
-const westLocation = 'scality-us-west-1';
+const westLocation = 'file';
 
 function _createAndAbortMpu(usEastSetting, fakeUploadID, locationConstraint,
     callback) {

tests/unit/bucket/bucketCreation.js

@@ -11,7 +11,7 @@ const log = new DummyRequestLogger();
 const headers = {};
 const authInfo = makeAuthInfo('accessKey1');
 
-const normalBehaviorLocationConstraint = 'scality-us-west-1';
+const normalBehaviorLocationConstraint = 'file';
 const specialBehaviorLocationConstraint = 'us-east-1';
 
 describe('bucket creation', () => {