summaryrefslogtreecommitdiff
path: root/src/mongo/dbtests/config_upgrade_tests.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/dbtests/config_upgrade_tests.cpp')
-rw-r--r--src/mongo/dbtests/config_upgrade_tests.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mongo/dbtests/config_upgrade_tests.cpp b/src/mongo/dbtests/config_upgrade_tests.cpp
index 7e1eb958c46..a108ebcd524 100644
--- a/src/mongo/dbtests/config_upgrade_tests.cpp
+++ b/src/mongo/dbtests/config_upgrade_tests.cpp
@@ -165,7 +165,7 @@ TEST_F(ConfigUpgradeTests, EmptyVersion) {
// Zero version (no version doc)
VersionType oldVersion;
- Status status = getConfigVersion(grid.catalogManager(), &oldVersion);
+ Status status = getConfigVersion(grid.catalogManager(&_txn), &oldVersion);
ASSERT(status.isOK());
ASSERT_EQUALS(oldVersion.getMinCompatibleVersion(), 0);
@@ -185,7 +185,7 @@ TEST_F(ConfigUpgradeTests, ClusterIDVersion) {
newVersion.clear();
// Current Version w/o clusterId (invalid!)
- Status status = getConfigVersion(grid.catalogManager(), &newVersion);
+ Status status = getConfigVersion(grid.catalogManager(&_txn), &newVersion);
ASSERT(!status.isOK());
newVersion.clear();
@@ -201,7 +201,7 @@ TEST_F(ConfigUpgradeTests, ClusterIDVersion) {
newVersion.clear();
// Current version w/ clusterId (valid!)
- status = getConfigVersion(grid.catalogManager(), &newVersion);
+ status = getConfigVersion(grid.catalogManager(&_txn), &newVersion);
ASSERT(status.isOK());
ASSERT_EQUALS(newVersion.getMinCompatibleVersion(), MIN_COMPATIBLE_CONFIG_VERSION);
@@ -218,8 +218,8 @@ TEST_F(ConfigUpgradeTests, InitialUpgrade) {
VersionType versionOld;
VersionType version;
string errMsg;
- bool result =
- checkAndUpgradeConfigVersion(grid.catalogManager(), false, &versionOld, &version, &errMsg);
+ bool result = checkAndUpgradeConfigVersion(
+ grid.catalogManager(&_txn), false, &versionOld, &version, &errMsg);
ASSERT(result);
ASSERT_EQUALS(versionOld.getCurrentVersion(), 0);
@@ -241,8 +241,8 @@ TEST_F(ConfigUpgradeTests, BadVersionUpgrade) {
VersionType versionOld;
VersionType version;
string errMsg;
- bool result =
- checkAndUpgradeConfigVersion(grid.catalogManager(), false, &versionOld, &version, &errMsg);
+ bool result = checkAndUpgradeConfigVersion(
+ grid.catalogManager(&_txn), false, &versionOld, &version, &errMsg);
ASSERT(!result);
}
@@ -257,11 +257,11 @@ TEST_F(ConfigUpgradeTests, CheckMongoVersion) {
storeShardsAndPings(5, 10); // 5 shards, 10 pings
// Our version is >= 2.2, so this works
- Status status = checkClusterMongoVersions(grid.catalogManager(), "2.2");
+ Status status = checkClusterMongoVersions(grid.catalogManager(&_txn), "2.2");
ASSERT(status.isOK());
// Our version is < 9.9, so this doesn't work (until we hit v99.99)
- status = checkClusterMongoVersions(grid.catalogManager(), "99.99");
+ status = checkClusterMongoVersions(grid.catalogManager(&_txn), "99.99");
ASSERT(status.code() == ErrorCodes::RemoteValidationError);
}