xuemingqiang/mongo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SERVER-69387 Debug Selectively Restored Sharded Collections

Browse Source
This commit is contained in:
Matt Kneiser
2022-09-29 04:14:06 +00:00
committed by Evergreen Agent
parent 1912e879e9
commit 1990f6a8a6
3 changed files with 68 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
jstests/sharding/run_restore.js
View File

@@ -116,8 +116,20 @@ assert.commandWorked(conn.getDB("admin").runCommand({setParameter: 1, logLevel:
assert.commandFailedWithCode(conn.getDB("admin").runCommand({_configsvrRunRestore: 1}),
ErrorCodes.NamespaceNotFound);
// Create the "local.system.collections_to_restore" collection and insert "test.a".
let [_, uuidStr] = aCollUUID.toString().match(/"((?:\\.|[^"\\])*)"/);
assert.commandWorked(conn.getDB("local").getCollection("system.collections_to_restore").insert({
ns: "test.a",
uuid: uuidStr
}));
// The "local.system.collections_to_restore" collection must have UUID as the correct type.
assert.commandFailedWithCode(conn.getDB("admin").runCommand({_configsvrRunRestore: 1}),
ErrorCodes.BadValue);
// Recreate the "local.system.collections_to_restore" collection and insert 'test.a'.
assert(conn.getDB("local").getCollection("system.collections_to_restore").drop());
assert.commandWorked(conn.getDB("local").createCollection("system.collections_to_restore"));
assert.commandWorked(conn.getDB("local").getCollection("system.collections_to_restore").insert({
ns: "test.a",
uuid: aCollUUID

4
jstests/sharding/run_restore_unsharded.js
View File

@@ -11,8 +11,8 @@
load("jstests/libs/feature_flag_util.js");
const s =
new ShardingTest({name: "runRestore", shards: 2, mongos: 1, config: 1, other: {chunkSize: 1}});
const s = new ShardingTest(
{name: "runRestoreUnsharded", shards: 2, mongos: 1, config: 1, other: {chunkSize: 1}});
let mongos = s.s0;
let db = s.getDB("test");

64
src/mongo/db/s/config/configsvr_run_restore_command.cpp
View File

@@ -37,6 +37,8 @@
#include "mongo/db/repl/storage_interface_impl.h"
#include "mongo/logv2/log.h"
#include "mongo/stdx/unordered_map.h"
#include "mongo/util/assert_util.h"
#include "mongo/util/uuid.h"
#define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kSharding
@@ -71,8 +73,27 @@ ShouldRestoreDocument shouldRestoreDocument(OperationContext* opCtx,
findRequest.setLimit(1);
DBDirectClient client(opCtx);
return client.find(findRequest)->itcount() > 0 ? ShouldRestoreDocument::kYes
: ShouldRestoreDocument::kNo;
auto resultCount = client.find(findRequest)->itcount();
// Log in cases where the schema is not adhered to.
if (resultCount == 0 && uuid) {
auto schemaCheckFindRequest =
FindCommandRequest(NamespaceString::kConfigsvrRestoreNamespace);
auto collectionsToRestore = client.find(schemaCheckFindRequest);
while (collectionsToRestore->more()) {
auto doc = collectionsToRestore->next();
try {
(void)UUID::parse(doc);
} catch (const AssertionException&) {
uasserted(ErrorCodes::BadValue,
str::stream() << "The uuid field of '" << doc.toString() << "' in '"
<< NamespaceString::kConfigsvrRestoreNamespace.toString()
<< "' needs to be of type UUID");
}
}
}
return resultCount > 0 ? ShouldRestoreDocument::kYes : ShouldRestoreDocument::kNo;
}
std::set<std::string> getDatabasesToRestore(OperationContext* opCtx) {
@@ -164,12 +185,11 @@ public:
restoreColl);
}
// Keeps track of database names for collections restored. Databases with no collections
// restored will have their entries removed in the config collections.
std::set<std::string> databasesRestored = getDatabasesToRestore(opCtx);
for (const auto& collectionEntry : kCollectionEntries) {
const NamespaceString& nss = collectionEntry.first;
boost::optional<std::string> nssFieldName = collectionEntry.second.first;
boost::optional<std::string> uuidFieldName = collectionEntry.second.second;
LOGV2(6261300, "1st Phase - Restoring collection entries", logAttrs(nss));
CollectionPtr coll =
@@ -186,9 +206,6 @@ public:
while (cursor->more()) {
auto doc = cursor->next();
boost::optional<std::string> nssFieldName = collectionEntry.second.first;
boost::optional<std::string> uuidFieldName = collectionEntry.second.second;
boost::optional<NamespaceString> docNss = boost::none;
boost::optional<UUID> docUUID = boost::none;
@@ -210,6 +227,11 @@ public:
uassertStatusOK(swDocUUID);
docUUID = swDocUUID.getValue();
LOGV2_DEBUG(6938701,
1,
"uuid found",
"uuid"_attr = uuidFieldName,
"docUUID"_attr = docUUID);
}
ShouldRestoreDocument shouldRestore = shouldRestoreDocument(opCtx, docNss, docUUID);
@@ -218,7 +240,9 @@ public:
1,
"Found document",
"doc"_attr = doc,
"shouldRestore"_attr = shouldRestore);
"shouldRestore"_attr = shouldRestore,
"db"_attr = coll->ns().db().toString(),
"docNss"_attr = docNss);
if (shouldRestore == ShouldRestoreDocument::kYes ||
shouldRestore == ShouldRestoreDocument::kMaybe) {
@@ -226,12 +250,22 @@ public:
}
// The collection for this document was not restored, delete it.
LOGV2_DEBUG(6938702,
1,
"Deleting collection that was not restored",
"db"_attr = coll->ns().db().toString(),
"uuid"_attr = coll->uuid(),
"_id"_attr = doc.getField("_id"));
NamespaceStringOrUUID nssOrUUID(coll->ns().db().toString(), coll->uuid());
uassertStatusOK(repl::StorageInterface::get(opCtx)->deleteById(
opCtx, nssOrUUID, doc.getField("_id")));
}
}
// Keeps track of database names for collections restored. Databases with no collections
// restored will have their entries removed in the config collections.
std::set<std::string> databasesRestored = getDatabasesToRestore(opCtx);
{
const std::vector<NamespaceString> databasesEntries = {
NamespaceString("config.databases")};
@@ -267,7 +301,9 @@ public:
1,
"Found document",
"doc"_attr = doc,
"shouldRestore"_attr = shouldRestore);
"shouldRestore"_attr = shouldRestore,
"db"_attr = coll->ns().db().toString(),
"dbNss"_attr = dbNss.toString());
if (shouldRestore) {
// This database had at least one collection restored.
@@ -275,6 +311,12 @@ public:
}
// No collection for this database was restored, delete it.
LOGV2_DEBUG(6938703,
1,
"Deleting database that was not restored",
"db"_attr = coll->ns().db().toString(),
"uuid"_attr = coll->uuid(),
"_id"_attr = doc.getField("_id"));
NamespaceStringOrUUID nssOrUUID(coll->ns().db().toString(), coll->uuid());
uassertStatusOK(repl::StorageInterface::get(opCtx)->deleteById(
opCtx, nssOrUUID, doc.getField("_id")));