Merge remote-tracking branch 'origin/bugfix/S3UTILS-180-sproxydKeysMa…

…pGrowsUnbounded' into w/1.15/bugfix/S3UTILS-180-sproxydKeysMapGrowsUnbounded

ObjectRepair/SproxydKeysSubscribers.js

@@ -19,7 +19,7 @@ class DuplicateSproxydKeyFoundHandler {
         this._getObjectURL = getObjectURL;
         this.queue = queue(this._repairObject, 1);
         // use OBJECT_REPAIR_DUPLICATE_KEYS_WINDOW_SIZE since there will be at least one sproxyd key per object
-        this.visitedObjects = new BoundedMap(env.DUPLICATE_KEYS_WINDOW_SIZE);
+        this.visitedObjects = new BoundedMap(env.OBJECT_REPAIR_DUPLICATE_KEYS_WINDOW_SIZE);
     }
 
     /**

ObjectRepair/env.js

@@ -1,12 +1,20 @@
 const env = {
     OBJECT_REPAIR_BUCKETD_HOSTPORT: process.env.OBJECT_REPAIR_BUCKETD_HOSTPORT,
-    OBJECT_REPAIR_SPROXYD_HOSTPORT: process.env.OBJECT_REPAIR_SPROXYD_HOSTPORT,
-    OBJECT_REPAIR_RAFT_SESSION_ID: process.env.OBJECT_REPAIR_RAFT_SESSION_ID,
-    OBJECT_REPAIR_RAFT_LOG_BATCH_SIZE: process.env.OBJECT_REPAIR_RAFT_LOG_BATCH_SIZE || 1000,
-    OBJECT_REPAIR_LOOKBACK_WINDOW: process.env.OBJECT_REPAIR_LOOKBACK_WINDOW || 10000,
-    OBJECT_REPAIR_LOG_LEVEL: process.env.OBJECT_REPAIR_LOG_LEVEL || 'info',
     OBJECT_REPAIR_DUMP_LEVEL: process.env.OBJECT_REPAIR_DUMP_LEVEL || 'error',
-    OBJECT_REPAIR_LOG_INTERVAL: process.env.OBJECT_REPAIR_LOG_INTERVAL || 300,
+    OBJECT_REPAIR_DUPLICATE_KEYS_WINDOW_SIZE:
+    Number.parseInt(process.env.OBJECT_REPAIR_DUPLICATE_KEYS_WINDOW_SIZE, 10) || 100000,
+    OBJECT_REPAIR_LOG_INTERVAL:
+    Number.parseInt(process.env.OBJECT_REPAIR_LOG_INTERVAL, 10) || 300,
+    OBJECT_REPAIR_LOG_LEVEL: process.env.OBJECT_REPAIR_LOG_LEVEL || 'info',
+    OBJECT_REPAIR_LOOKBACK_WINDOW:
+    Number.parseInt(process.env.OBJECT_REPAIR_LOOKBACK_WINDOW, 10) || 10000,
+    OBJECT_REPAIR_RAFT_LOG_BATCH_SIZE:
+    Number.parseInt(process.env.OBJECT_REPAIR_RAFT_LOG_BATCH_SIZE, 10) || 1000,
+    OBJECT_REPAIR_RAFT_LOG_BEGIN_SEQ:
+    Number.parseInt(process.env.OBJECT_REPAIR_RAFT_LOG_BEGIN_SEQ, 10) || null,
+    OBJECT_REPAIR_RAFT_SESSION_ID:
+    Number.parseInt(process.env.OBJECT_REPAIR_RAFT_SESSION_ID, 10) || undefined,
+    OBJECT_REPAIR_SPROXYD_HOSTPORT: process.env.OBJECT_REPAIR_SPROXYD_HOSTPORT,
 };
 
 module.exports = { env };

ObjectRepair/index.js

@@ -44,28 +44,26 @@ Optional environment variables:
     OBJECT_REPAIR_TLS_CA_PATH: path to TLS alternate CA file
 `;
 for (const [key, value] of Object.entries(env)) {
-    if (!value) {
+    if (value === undefined) {
         log.info(`${key} must be defined`);
         console.error(USAGE);
         process.exit(1);
     }
 }
 
-env.OBJECT_REPAIR_RAFT_LOG_BEGIN_SEQ = process.env.OBJECT_REPAIR_RAFT_LOG_BEGIN_SEQ;
-
 /**
  * Creates new reader and runs until stop().
  * @returns {undefined}
  */
 function runJournalReader() {
-    if (env.OBJECT_REPAIR_RAFT_LOG_BEGIN_SEQ === undefined) {
+    if (env.OBJECT_REPAIR_RAFT_LOG_BEGIN_SEQ === null) {
         log.info('OBJECT_REPAIR_RAFT_LOG_BEGIN_SEQ is not defined.'
         + 'Ingestion will start at latest cseq - OBJECT_REPAIR_LOOKBACK_WINDOW');
     }
     const reader = new RaftJournalReader(
-        Number.parseInt(env.OBJECT_REPAIR_RAFT_LOG_BEGIN_SEQ, 10),
-        Number.parseInt(env.OBJECT_REPAIR_RAFT_LOG_BATCH_SIZE, 10),
-        Number.parseInt(env.OBJECT_REPAIR_RAFT_SESSION_ID, 10),
+        env.OBJECT_REPAIR_RAFT_LOG_BEGIN_SEQ,
+        env.OBJECT_REPAIR_RAFT_LOG_BATCH_SIZE,
+        env.OBJECT_REPAIR_RAFT_SESSION_ID,
     );
     reader.run();
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "s3utils",
-  "version": "1.15.2",
+  "version": "1.15.3",
   "engines": {
     "node": ">= 16"
   },