Skip to content

Commit

Permalink
Revert "SERVER-26712 fix variable naming in checkDBHashesForReplSet"
Browse files Browse the repository at this point in the history 
This reverts commit 7154b9f.
  • Loading branch information
Tess Avitabile committed Oct 28, 2016
1 parent e923952 commit dd33678
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/mongo/shell/replsettest.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1060,7 +1060,7 @@ var ReplSetTest = function(opts) {
assert.commandWorked(primaryDBHash);

try {
var primaryCollInfos = primary.getDB(dbName).getCollectionInfos();
var primaryCollInfo = primary.getDB(dbName).getCollectionInfos();
} catch (e) {
if (jsTest.options().skipValidationOnInvalidViewDefinitions) {
assert.commandFailedWithCode(e, ErrorCodes.InvalidViewDefinition);
Expand Down Expand Up @@ -1112,15 +1112,15 @@ var ReplSetTest = function(opts) {

// Check that collection information is consistent on the primary and
// secondaries.
var secondaryCollInfos = secondary.getDB(dbName).getCollectionInfos();
secondaryCollInfos.forEach(secondaryInfo => {
var secondaryCollInfo = secondary.getDB(dbName).getCollectionInfos();
secondaryCollInfo.forEach(secondaryInfo => {
// SERVER-26712 Temporarily avoid validating _id index version.
if (secondaryInfo.hasOwnProperty('idIndex'))
delete secondaryInfo.idIndex.v;
primaryCollInfos.forEach(primaryInfo => {
if (secondaryCollInfo.hasOwnProperty('idIndex'))
delete secondaryCollInfo.idIndex.v;
primaryCollInfo.forEach(primaryInfo => {
// SERVER-26712 Temporarily avoid validating _id index version.
if (primaryInfo.hasOwnProperty('idIndex'))
delete primaryInfo.idIndex.v;
if (primaryCollInfo.hasOwnProperty('idIndex'))
delete primaryCollInfo.idIndex.v;
if (secondaryInfo.name === primaryInfo.name) {
if (!bsonBinaryEqual(secondaryInfo, primaryInfo)) {
print(msgPrefix +
Expand Down

0 comments on commit dd33678

Please sign in to comment.