Revert "SERVER-54967 Remove workaround for comparing size outside of bsonBinaryEqual in checkDBHash"

This reverts commit 63c1168646ae34866befd1ec8dcfd7de53a72e29.

1 files changed, 23 insertions, 0 deletions

diff --git a/src/mongo/shell/data_consistency_checker.js b/src/mongo/shell/data_consistency_checker.js
index 802fb60841b..4cdfb07dd87 100644
--- a/src/mongo/shell/data_consistency_checker.js
+++ b/src/mongo/shell/data_consistency_checker.js
@@ -328,6 +328,22 @@ var {DataConsistencyChecker} = (function() {
                             delete syncingInfo.idIndex.ns;
                         }
 
+                        // TODO: SERVER-54967 Remove workaround for comparing size
+                        let sizeDeleted = false;
+                        let sourceSize = sourceInfo.options.size;
+                        let syncingSize = syncingInfo.options.size;
+
+                        // Compare 'size' field in 'options' field outside of bsonBinaryEqual as it
+                        // could be saved as a NumberDecimal or NumberLong in versions 4.4 and
+                        // before.
+                        if (jsTest.options().useRandomBinVersionsWithinReplicaSet &&
+                            sourceInfo.options.size == syncingInfo.options.size &&
+                            sourceInfo.options.size !== syncingInfo.options.size) {
+                            delete sourceInfo.options.size;
+                            delete syncingInfo.options.size;
+                            sizeDeleted = true;
+                        }
+
                         if (!bsonBinaryEqual(syncingInfo, sourceInfo)) {
                             prettyPrint(
                                 `the two nodes have different attributes for the collection or view ${
@@ -338,6 +354,13 @@ var {DataConsistencyChecker} = (function() {
                                                     syncingInfo.name);
                             success = false;
                         }
+
+                        // Deleted sizes must be added back to prevent comparison between nodes that
+                        // have not had their size removed.
+                        if (sizeDeleted) {
+                            sourceInfo.options.size = sourceSize;
+                            syncingInfo.options.size = syncingSize;
+                        }
                     }
                 });
             });