diff options
| author | Spencer T Brody <spencer@mongodb.com> | 2014-03-04 15:48:37 -0500 |
|---|---|---|
| committer | Spencer T Brody <spencer@mongodb.com> | 2014-03-05 12:08:07 -0500 |
| commit | 8e32f95f00f4527d31c7fdd0f4e96ee28efc5a08 (patch) | |
| tree | cf45ff89f52fe08cc58172acb751a04cfa22d888 | |
| parent | 0ee6886263937f9ed0e9d74fa8753cac02a18617 (diff) | |
| download | mongo-8e32f95f00f4527d31c7fdd0f4e96ee28efc5a08.tar.gz | |
fix single-db restores without the --restoreDbUsersAndRoles flag
| -rw-r--r-- | src/mongo/tools/restore.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/mongo/tools/restore.cpp b/src/mongo/tools/restore.cpp index 9cc6c877dbe..16f1ae5694c 100644 --- a/src/mongo/tools/restore.cpp +++ b/src/mongo/tools/restore.cpp @@ -74,7 +74,8 @@ public: int _serverAuthzVersion; // authSchemaVersion of the cluster being restored into. int _dumpFileAuthzVersion; // version extracted from admin.system.version file in dump. bool _serverAuthzVersionDocExists; // Whether the remote cluster has an admin.system.version doc - Restore() : BSONTool() { } + Restore() : BSONTool(), _oplogEntrySkips(0), _oplogEntryApplies(0), _serverAuthzVersion(0), + _dumpFileAuthzVersion(0), _serverAuthzVersionDocExists(false) { } virtual void printHelp(ostream& out) { printMongoRestoreHelp(&out); @@ -130,9 +131,9 @@ public: _serverBinVersion = out["version"].String(); } - storeRemoteAuthzVersion(); // populate _serverAuthzVersion - if (mongoRestoreGlobalParams.restoreUsersAndRoles) { + storeRemoteAuthzVersion(); // populate _serverAuthzVersion + if (_serverAuthzVersion == AuthorizationManager::schemaVersion26Final) { uassert(17410, mongoutils::str::stream() << mongoRestoreGlobalParams.tempUsersColl << @@ -623,6 +624,7 @@ public: AuthorizationManager::schemaVersion26Final << ". Found server version " << _serverBinVersion << " with " "authorization schema version " << _serverAuthzVersion, + _curdb != "admin" || versionCmp(_serverBinVersion, "2.5.4") < 0 || _serverAuthzVersion == AuthorizationManager::schemaVersion26Final); @@ -650,7 +652,8 @@ public: conn().insert(mongoRestoreGlobalParams.tempUsersColl, obj); } } else { - if (_serverAuthzVersion == AuthorizationManager::schemaVersion26Final && + if (_curdb == "admin" && + _serverAuthzVersion == AuthorizationManager::schemaVersion26Final && !_serverAuthzVersionDocExists) { // server with schemaVersion26Final implies it is running 2.5.4 or greater. uasserted(17415, |