code fixups post bumps

Author: benzekrimaha

CRR/ReplicationStatusUpdater.js

@@ -352,7 +352,7 @@ class ReplicationStatusUpdater {
                     });
                 },
             ),
-            callback => {
+            async () => {
                 if (this._nUpdated >= this.maxUpdates || this._nProcessed >= this.maxScanned) {
                     this._logProgress();
                     let remainingBuckets;
@@ -378,12 +378,12 @@ class ReplicationStatusUpdater {
                             + `VERSION_ID_MARKER=${this._VersionIdMarker}`;
                     }
                     this.log.info(message);
-                    return callback(null, false);
+                    return false;
                 }
                 if (this._VersionIdMarker || this._KeyMarker) {
-                    return callback(null, true);
+                    return true;
                 }
-                return callback(null, false);
+                return false;
             },
             err => {
                 this._bucketInProgress = null;

CompareRaftMembers/BlockDigestsStorage.js

@@ -41,7 +41,7 @@ class BlockDigestsStorage extends stream.Writable {
         const { size, digest, lastKey } = blockInfo;
         this.cargo.push({
             type: 'put',
-            key: lastKey,
+            key: lastKey, // index by last block key for efficient lookup
             value: JSON.stringify({ size, digest }),
         });
         // heuristic to have basic flow control: delay the callback
@@ -57,7 +57,7 @@ class BlockDigestsStorage extends stream.Writable {
         if (this.cargo.idle()) {
             this.db.close(callback);
         } else {
-            this.cargo.drain (() => {
+            this.cargo.drain(() => {
                 this.db.close(callback);
             });
         }

CountItems/CountWorkerObj.js

@@ -21,9 +21,13 @@ class CountWorkerObj {
             }
         });
         this._worker.on('message', data => {
-            if (data.owner !== 'scality') {return;}
+            if (data.owner !== 'scality') {
+                return;
+            }
             const cb = this._getCallback(data.id);
-            if (!cb) {return;}
+            if (!cb) {
+                return;
+            }
             switch (data.type) {
             case 'setup':
                 if (data.status === 'passed') {
@@ -81,7 +85,9 @@ class CountWorkerObj {
     }
 
     _getCallback(id) {
-        if (!this.callbacks.has(id)) {return null;}
+        if (!this.callbacks.has(id)) {
+            return null;
+        }
         const ret = this.callbacks.get(id);
         this.callbacks.delete(id);
         return ret.callback;

StalledRetry/StalledRequestHandler.js

@@ -71,10 +71,8 @@ class StalledRequestHandler {
 
     _waitForCompletion(cb) {
         async.whilst(
-            callback => {
-                callback(null, !this.killed && this.isInProgress());
-            },
-            next => setTimeout(next, 1000),
+            async () => (!this.killed && this.isInProgress()),
+            done => setTimeout(done, 1000),
             cb
         );
     }

VerifyReplication/verifyReplication.js

@@ -88,7 +88,7 @@ function handlePrefixes(prefixList, cb) {
             bucket: statusObj.srcBucket,
             prefix,
             listingLimit,
-        };       
+        };
         return listAndCompare(params, done);
     }, cb);
 }

compareBuckets/compareBuckets.js

@@ -94,7 +94,7 @@ function compareBuckets(params, log, cb) {
                                 log.error('Error fetching src bucket', { error: err });
                                 return _done(err);
                             }
-                            srcContents = contents || [];
+                            srcContents = contents;
                             srcDone = !isTruncated;
                             bucketdSrcParams.marker = marker;
                             statusObj.srcKeyMarker = marker;
@@ -114,7 +114,7 @@ function compareBuckets(params, log, cb) {
                                 log.error('Error fetching dst bucket', { error: err });
                                 return _done(err);
                             }
-                            dstContents = contents || [];
+                            dstContents = contents;
                             dstDone = !isTruncated;
                             bucketdDstParams.marker = marker;
                             statusObj.dstKeyMarker = marker;
@@ -220,9 +220,7 @@ function compareBuckets(params, log, cb) {
                 return process.nextTick(() => done(null));
             });
         },
-        callback => {
-            callback(null, !srcDone || !dstDone || srcContents.length > 0 || dstContents.length > 0);
-        },
+        async () => (!srcDone || !dstDone || srcContents.length > 0 || dstContents.length > 0),
         err => {
             statusObj.dstBucketInProgress = null;
             statusObj.srcBucketInProgress = null;

repairDuplicateVersionIds.js

@@ -154,8 +154,6 @@ function repairObject(objInfo, cb) {
             // use "versionId" from the parsed metadata instead of
             // `objInfo.firstVersionId`, since it may have changed
             // since the scan ran
-            //
-             
             [md.versionId] = versionIds;
             return putObjectMetadata(objInfo.objectUrl, md, err => {
                 if (err) {

service-level-sidecar/bucketd.js

@@ -36,8 +36,7 @@ async function* listBuckets(log) {
 
     while (true) {
         let res;
-
-        try {             
+        try {   
             res = await listObjects(usersBucket, { ...listingParams, gt }, log);
         } catch (error) {
             if (error.NoSuchBucket) {

verifyBucketSproxydKeys.js

@@ -417,7 +417,6 @@ function listBucketIter(bucket, cb) {
             if (vidSepPos === -1) {
                 const reVersionIds = /"versionId":"([^"]*)"/g;
                 const versionIds = [];
-                 
                 while (true) {
                     const reVersionIdMatch = reVersionIds.exec(item.value);
                     if (!reVersionIdMatch) {