Fix extracting unique reference of oplog documents on Mongo >=7.1.0

delthas · delthas · commit 1da03698e5c0 · 2025-12-31T15:38:49.000+01:00
The h field was removed, replaced with ts. Issue: ARSN-545 Signed-off-by: Thomas Flament <thomas.flament@scality.com>
diff --git a/lib/storage/metadata/mongoclient/ListRecordStream.js b/lib/storage/metadata/mongoclient/ListRecordStream.js
@@ -63,7 +63,7 @@ class ListRecordStream extends stream.Readable {
 
     _processItem(itemObj) {
         // always update to most recent uniqID
-        this._lastConsumedID = itemObj.h.toString();
+        this._lastConsumedID = (itemObj.h || itemObj.ts).toString();
 
         // only push to stream unpublished objects
         if (!this._lastSavedID) {
diff --git a/lib/storage/metadata/mongoclient/LogConsumer.js b/lib/storage/metadata/mongoclient/LogConsumer.js
@@ -117,7 +117,7 @@ class LogConsumer {
                 if (!data || data.length === 0) {
                     return cb(new Error('no oplog entry found'));
                 }
-                const latestOplogID = data[0].h.toString();
+                const latestOplogID = (data[0].h || data[0].ts).toString();
                 this._logger.debug('latest oplog ID read', { latestOplogID });
                 return cb(null, latestOplogID);
             })

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ class LogConsumer {`
`117`	`117`	`if (!data \|\| data.length === 0) {`
`118`	`118`	`return cb(new Error('no oplog entry found'));`
`119`	`119`	`}`
`120`		`- const latestOplogID = data[0].h.toString();`
	`120`	`+ const latestOplogID = (data[0].h \|\| data[0].ts).toString();`
`121`	`121`	`this._logger.debug('latest oplog ID read', { latestOplogID });`
`122`	`122`	`return cb(null, latestOplogID);`
`123`	`123`	`})`