Merge pull request #419 from scality/fix/replaceUpdate

Fix/stopSwallowingErrors
scality · Feb 14, 2018 · fd23e82 · fd23e82
2 parents d0f4f95 + d7cf5e8
commit fd23e82
Showing 1 changed file with 54 additions and 6 deletions.
diff --git a/lib/storage/metadata/mongoclient/MongoClientInterface.js b/lib/storage/metadata/mongoclient/MongoClientInterface.js
@@ -161,7 +161,15 @@ class MongoClientInterface {
             value: newBucketMD,
         }, {
             upsert: true,
-        }, () => cb());
+        }, err => {
+            if (err) {
+                log.error(
+                    'createBucket: error creating bucket',
+                { error: err.message });
+                return cb(errors.InternalError);
+            }
+            return cb();
+        });
     }
 
     getBucketAttributes(bucketName, log, cb) {
@@ -229,7 +237,15 @@ class MongoClientInterface {
             value: newBucketMD,
         }, {
             upsert: true,
-        }, () => cb());
+        }, err => {
+            if (err) {
+                log.error(
+                    'putBucketAttributes: error putting bucket attributes',
+                { error: err.message });
+                return cb(errors.InternalError);
+            }
+            return cb();
+        });
     }
 
     /*
@@ -312,7 +328,15 @@ class MongoClientInterface {
             },
         }], {
             ordered: 1,
-        }, () => cb(null, `{"versionId": "${versionId}"}`));
+        }, err => {
+            if (err) {
+                log.error(
+                    'putObjectVerCase1: error putting object version',
+                { error: err.message });
+                return cb(errors.InternalError);
+            }
+            return cb(null, `{"versionId": "${versionId}"}`);
+        });
     }
 
     /*
@@ -332,7 +356,15 @@ class MongoClientInterface {
             value: objVal,
         }, {
             upsert: true,
-        }, () => cb(null, `{"versionId": "${objVal.versionId}"}`));
+        }, err => {
+            if (err) {
+                log.error(
+                    'putObjectVerCase2: error putting object version',
+                { error: err.message });
+                return cb(errors.InternalError);
+            }
+            return cb(null, `{"versionId": "${objVal.versionId}"}`);
+        });
     }
 
     /*
@@ -368,7 +400,15 @@ class MongoClientInterface {
             },
         }], {
             ordered: 1,
-        }, () => cb(null, `{"versionId": "${objVal.versionId}"}`));
+        }, err => {
+            if (err) {
+                log.error(
+                    'putObjectVerCase3: error putting object version',
+                { error: err.message });
+                return cb(errors.InternalError);
+            }
+            return cb(null, `{"versionId": "${objVal.versionId}"}`);
+        });
     }
 
     /*
@@ -603,7 +643,15 @@ class MongoClientInterface {
             },
         }], {
             ordered: 1,
-        }, () => this.deleteOrRepairPHD(c, bucketName, objName, mst, log, cb));
+        }, err => {
+            if (err) {
+                log.error(
+                    'deleteObjectVerMaster: error deleting object',
+                { error: err.message });
+                return cb(errors.InternalError);
+            }
+            return this.deleteOrRepairPHD(c, bucketName, objName, mst, log, cb);
+        });
     }
 
     /*