summaryrefslogtreecommitdiff
path: root/src/mongo
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo')
-rw-r--r--src/mongo/db/catalog_raii.cpp9
-rw-r--r--src/mongo/db/commands/SConscript1
-rw-r--r--src/mongo/db/commands/dbhash.cpp7
-rw-r--r--src/mongo/db/commands/invalidate_view_catalog_command.cpp95
-rw-r--r--src/mongo/db/db_raii.cpp7
-rw-r--r--src/mongo/db/db_raii.h3
-rw-r--r--src/mongo/db/ops/write_ops_exec.cpp13
-rw-r--r--src/mongo/db/pipeline/document_source_cursor.cpp2
-rw-r--r--src/mongo/db/repl/storage_interface_impl.cpp8
-rw-r--r--src/mongo/db/repl/sync_tail.cpp7
-rw-r--r--src/mongo/db/views/view_catalog.cpp8
11 files changed, 43 insertions, 117 deletions
diff --git a/src/mongo/db/catalog_raii.cpp b/src/mongo/db/catalog_raii.cpp
index fdefc58956a..1cf07f5e18f 100644
--- a/src/mongo/db/catalog_raii.cpp
+++ b/src/mongo/db/catalog_raii.cpp
@@ -92,6 +92,15 @@ AutoGetCollection::AutoGetCollection(OperationContext* opCtx,
<< " disappeared after successufully resolving "
<< nsOrUUID.toString());
+ // In most cases we expect modifications for system.views to upgrade MODE_IX to MODE_X before
+ // taking the lock. One exception is a query by UUID of system.views in a transaction. Usual
+ // queries of system.views (by name, not UUID) within a transaction are rejected. However, if
+ // the query is by UUID we can't determine whether the namespace is actually system.views until
+ // we take the lock here. So we have this one last assertion.
+ uassert(51070,
+ "Modifications to system.views must take an exclusive lock",
+ !_resolvedNss.isSystemDotViews() || modeColl != MODE_IX);
+
// If the database doesn't exists, we can't obtain a collection or check for views
if (!db)
return;
diff --git a/src/mongo/db/commands/SConscript b/src/mongo/db/commands/SConscript
index 244f284fe33..b31517bfbc9 100644
--- a/src/mongo/db/commands/SConscript
+++ b/src/mongo/db/commands/SConscript
@@ -326,7 +326,6 @@ env.Library(
"do_txn_cmd.cpp",
"driverHelpers.cpp",
"haystack.cpp",
- "invalidate_view_catalog_command.cpp",
"mr.cpp",
"oplog_application_checks.cpp",
"oplog_note.cpp",
diff --git a/src/mongo/db/commands/dbhash.cpp b/src/mongo/db/commands/dbhash.cpp
index 5cbcc0015ba..669f707111a 100644
--- a/src/mongo/db/commands/dbhash.cpp
+++ b/src/mongo/db/commands/dbhash.cpp
@@ -121,7 +121,7 @@ public:
if (txnParticipant && txnParticipant->inMultiDocumentTransaction()) {
// However, if we are inside a multi-statement transaction, then we only need to lock
// the database in intent mode to ensure that none of the collections get dropped.
- lockMode = getLockModeForQuery(opCtx);
+ lockMode = getLockModeForQuery(opCtx, boost::none);
}
AutoGetDb autoDb(opCtx, ns, lockMode);
Database* db = autoDb.getDb();
@@ -227,8 +227,9 @@ private:
// reading from the consistent snapshot doesn't overlap with any catalog operations on
// the collection.
invariant(
- opCtx->lockState()->isDbLockedForMode(db->name(), getLockModeForQuery(opCtx)));
- collLock.emplace(opCtx->lockState(), fullCollectionName, getLockModeForQuery(opCtx));
+ opCtx->lockState()->isDbLockedForMode(db->name(), getLockModeForQuery(opCtx, ns)));
+ collLock.emplace(
+ opCtx->lockState(), fullCollectionName, getLockModeForQuery(opCtx, ns));
auto minSnapshot = collection->getMinimumVisibleSnapshot();
auto mySnapshot = opCtx->recoveryUnit()->getPointInTimeReadTimestamp();
diff --git a/src/mongo/db/commands/invalidate_view_catalog_command.cpp b/src/mongo/db/commands/invalidate_view_catalog_command.cpp
deleted file mode 100644
index 5c3988fb466..00000000000
--- a/src/mongo/db/commands/invalidate_view_catalog_command.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-
-/**
- * Copyright (C) 2018-present MongoDB, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the Server Side Public License, version 1,
- * as published by MongoDB, Inc.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Server Side Public License for more details.
- *
- * You should have received a copy of the Server Side Public License
- * along with this program. If not, see
- * <http://www.mongodb.com/licensing/server-side-public-license>.
- *
- * As a special exception, the copyright holders give permission to link the
- * code of portions of this program with the OpenSSL library under certain
- * conditions as described in each individual source file and distribute
- * linked combinations including the program with the OpenSSL library. You
- * must comply with the Server Side Public License in all respects for
- * all of the code used other than as permitted herein. If you modify file(s)
- * with this exception, you may extend this exception to your version of the
- * file(s), but you are not obligated to do so. If you do not wish to do so,
- * delete this exception statement from your version. If you delete this
- * exception statement from all source files in the program, then also delete
- * it in the license file.
- */
-
-#include "mongo/platform/basic.h"
-
-#include "mongo/db/catalog_raii.h"
-#include "mongo/db/commands.h"
-#include "mongo/db/commands/test_commands_enabled.h"
-
-namespace mongo {
-/**
- * Testing-only command that invalidates a database's view catalog.
- */
-class InvalidateViewCatalogCmd final : public BasicCommand {
-public:
- InvalidateViewCatalogCmd() : BasicCommand("invalidateViewCatalog") {}
-
- Status checkAuthForOperation(OperationContext* opCtx,
- const std::string& dbname,
- const BSONObj& cmdObj) const final {
- // No auth checks as this is a testing-only command.
- return Status::OK();
- }
-
- bool adminOnly() const final {
- return false;
- }
-
- bool maintenanceMode() const final {
- return true;
- }
-
- bool maintenanceOk() const final {
- return true;
- }
-
- AllowedOnSecondary secondaryAllowed(ServiceContext*) const final {
- return AllowedOnSecondary::kAlways;
- }
-
- bool supportsWriteConcern(const BSONObj& cmd) const final {
- return false;
- }
-
- std::string help() const final {
- return "invalidate view catalog\n"
- "Internal command for testing only. Invalidates a database's view catalog,\n"
- "forcing a reload on the next view operation.\n";
- }
-
- bool run(OperationContext* opCtx,
- const std::string& dbName,
- const BSONObj& cmdObj,
- BSONObjBuilder& result) final {
- AutoGetDb dblock(opCtx, dbName, LockMode::MODE_IS);
- auto db = dblock.getDb();
- uassert(ErrorCodes::NamespaceNotFound,
- str::stream() << "database " << dbName << " does not exist",
- db);
-
- db->getViewCatalog()->invalidate();
- return true;
- }
-};
-
-MONGO_REGISTER_TEST_COMMAND(InvalidateViewCatalogCmd);
-
-} // namespace mongo
diff --git a/src/mongo/db/db_raii.cpp b/src/mongo/db/db_raii.cpp
index 8555132b7ba..a5a2faae528 100644
--- a/src/mongo/db/db_raii.cpp
+++ b/src/mongo/db/db_raii.cpp
@@ -98,7 +98,7 @@ AutoGetCollectionForRead::AutoGetCollectionForRead(OperationContext* opCtx,
opCtx->getServiceContext()->getStorageEngine()->supportsReadConcernSnapshot()) {
_shouldNotConflictWithSecondaryBatchApplicationBlock.emplace(opCtx->lockState());
}
- const auto collectionLockMode = getLockModeForQuery(opCtx);
+ const auto collectionLockMode = getLockModeForQuery(opCtx, nsOrUUID.nss());
_autoColl.emplace(opCtx, nsOrUUID, collectionLockMode, viewMode, deadline);
// If the read source is explicitly set to kNoTimestamp, we read the most up to date data and do
@@ -330,12 +330,15 @@ OldClientContext::~OldClientContext() {
currentOp->getReadWriteType());
}
-LockMode getLockModeForQuery(OperationContext* opCtx) {
+LockMode getLockModeForQuery(OperationContext* opCtx, const boost::optional<NamespaceString>& nss) {
invariant(opCtx);
// Use IX locks for autocommit:false multi-statement transactions; otherwise, use IS locks.
auto txnParticipant = TransactionParticipant::get(opCtx);
if (txnParticipant && txnParticipant->inMultiDocumentTransaction()) {
+ uassert(51071,
+ "Cannot query system.views within a transaction",
+ !nss || !nss->isSystemDotViews());
return MODE_IX;
}
return MODE_IS;
diff --git a/src/mongo/db/db_raii.h b/src/mongo/db/db_raii.h
index 39a30282630..40ede468e0d 100644
--- a/src/mongo/db/db_raii.h
+++ b/src/mongo/db/db_raii.h
@@ -215,7 +215,8 @@ private:
/**
* Returns a MODE_IX LockMode if a read is performed under readConcern level snapshot, or a MODE_IS
* lock otherwise. MODE_IX acquisition will allow a read to participate in two-phase locking.
+ * Throws an exception if 'system.views' is being queried within a transaction.
*/
-LockMode getLockModeForQuery(OperationContext* opCtx);
+LockMode getLockModeForQuery(OperationContext* opCtx, const boost::optional<NamespaceString>& nss);
} // namespace mongo
diff --git a/src/mongo/db/ops/write_ops_exec.cpp b/src/mongo/db/ops/write_ops_exec.cpp
index 200f263a283..1007bb72d3c 100644
--- a/src/mongo/db/ops/write_ops_exec.cpp
+++ b/src/mongo/db/ops/write_ops_exec.cpp
@@ -302,6 +302,10 @@ SingleWriteResult createIndex(OperationContext* opCtx,
return result;
}
+LockMode fixLockModeForSystemDotViewsChanges(const NamespaceString& nss, LockMode mode) {
+ return nss.isSystemDotViews() ? MODE_X : mode;
+}
+
void insertDocuments(OperationContext* opCtx,
Collection* collection,
std::vector<InsertStatement>::iterator begin,
@@ -373,7 +377,10 @@ bool insertBatchAndHandleErrors(OperationContext* opCtx,
uasserted(ErrorCodes::InternalError, "failAllInserts failpoint active!");
}
- collection.emplace(opCtx, wholeOp.getNamespace(), MODE_IX);
+ collection.emplace(
+ opCtx,
+ wholeOp.getNamespace(),
+ fixLockModeForSystemDotViewsChanges(wholeOp.getNamespace(), MODE_IX));
if (collection->getCollection())
break;
@@ -605,7 +612,7 @@ static SingleWriteResult performSingleUpdateOp(OperationContext* opCtx,
collection.emplace(opCtx,
ns,
MODE_IX, // DB is always IX, even if collection is X.
- MODE_IX);
+ fixLockModeForSystemDotViewsChanges(ns, MODE_IX));
if (collection->getCollection() || !updateRequest.isUpsert())
break;
@@ -845,7 +852,7 @@ static SingleWriteResult performSingleDeleteOp(OperationContext* opCtx,
AutoGetCollection collection(opCtx,
ns,
MODE_IX, // DB is always IX, even if collection is X.
- MODE_IX);
+ fixLockModeForSystemDotViewsChanges(ns, MODE_IX));
if (collection.getDb()) {
curOp.raiseDbProfileLevel(collection.getDb()->getProfilingLevel());
}
diff --git a/src/mongo/db/pipeline/document_source_cursor.cpp b/src/mongo/db/pipeline/document_source_cursor.cpp
index fe78bda703c..8a75b77ed1c 100644
--- a/src/mongo/db/pipeline/document_source_cursor.cpp
+++ b/src/mongo/db/pipeline/document_source_cursor.cpp
@@ -216,7 +216,7 @@ Value DocumentSourceCursor::serialize(boost::optional<ExplainOptions::Verbosity>
{
auto opCtx = pExpCtx->opCtx;
- auto lockMode = getLockModeForQuery(opCtx);
+ auto lockMode = getLockModeForQuery(opCtx, _exec->nss());
AutoGetDb dbLock(opCtx, _exec->nss().db(), lockMode);
Lock::CollectionLock collLock(opCtx->lockState(), _exec->nss().ns(), lockMode);
auto collection =
diff --git a/src/mongo/db/repl/storage_interface_impl.cpp b/src/mongo/db/repl/storage_interface_impl.cpp
index b473d08aa62..d46302c1517 100644
--- a/src/mongo/db/repl/storage_interface_impl.cpp
+++ b/src/mongo/db/repl/storage_interface_impl.cpp
@@ -91,6 +91,9 @@ using UniqueLock = stdx::unique_lock<stdx::mutex>;
const auto kIdIndexName = "_id_"_sd;
+LockMode fixLockModeForSystemDotViewsChanges(const NamespaceString& nss, LockMode mode) {
+ return nss.isSystemDotViews() ? MODE_X : mode;
+}
} // namespace
StorageInterfaceImpl::StorageInterfaceImpl()
@@ -219,7 +222,7 @@ StorageInterfaceImpl::createCollectionForBulkLoading(
// Get locks and create the collection.
AutoGetOrCreateDb db(opCtx.get(), nss.db(), MODE_X);
- AutoGetCollection coll(opCtx.get(), nss, MODE_IX);
+ AutoGetCollection coll(opCtx.get(), nss, fixLockModeForSystemDotViewsChanges(nss, MODE_IX));
if (coll.getCollection()) {
return Status(ErrorCodes::NamespaceExists,
@@ -232,7 +235,8 @@ StorageInterfaceImpl::createCollectionForBulkLoading(
wunit.commit();
}
- autoColl = stdx::make_unique<AutoGetCollection>(opCtx.get(), nss, MODE_IX);
+ autoColl = stdx::make_unique<AutoGetCollection>(
+ opCtx.get(), nss, fixLockModeForSystemDotViewsChanges(nss, MODE_IX));
// Build empty capped indexes. Capped indexes cannot be built by the MultiIndexBlock
// because the cap might delete documents off the back while we are inserting them into
diff --git a/src/mongo/db/repl/sync_tail.cpp b/src/mongo/db/repl/sync_tail.cpp
index e7b666ff784..1b879b6ba4b 100644
--- a/src/mongo/db/repl/sync_tail.cpp
+++ b/src/mongo/db/repl/sync_tail.cpp
@@ -268,6 +268,10 @@ Status finishAndLogApply(ClockSource* clockSource,
return finalStatus;
}
+LockMode fixLockModeForSystemDotViewsChanges(const NamespaceString& nss, LockMode mode) {
+ return nss.isSystemDotViews() ? MODE_X : mode;
+}
+
} // namespace
// static
@@ -331,7 +335,8 @@ Status SyncTail::syncApply(OperationContext* opCtx,
return finishApply(writeConflictRetry(opCtx, "syncApply_CRUD", nss.ns(), [&] {
// Need to throw instead of returning a status for it to be properly ignored.
try {
- AutoGetCollection autoColl(opCtx, getNsOrUUID(nss, op), MODE_IX);
+ AutoGetCollection autoColl(
+ opCtx, getNsOrUUID(nss, op), fixLockModeForSystemDotViewsChanges(nss, MODE_IX));
auto db = autoColl.getDb();
uassert(ErrorCodes::NamespaceNotFound,
str::stream() << "missing database (" << nss.db() << ")",
diff --git a/src/mongo/db/views/view_catalog.cpp b/src/mongo/db/views/view_catalog.cpp
index 67aa5b27cab..e9763fc488d 100644
--- a/src/mongo/db/views/view_catalog.cpp
+++ b/src/mongo/db/views/view_catalog.cpp
@@ -60,7 +60,6 @@
namespace mongo {
namespace {
-MONGO_FAIL_POINT_DEFINE(hangDuringViewResolution);
StatusWith<std::unique_ptr<CollatorInterface>> parseCollator(OperationContext* opCtx,
BSONObj collationSpec) {
@@ -460,13 +459,6 @@ StatusWith<ResolvedView> ViewCatalog::resolveView(OperationContext* opCtx,
int depth = 0;
for (; depth < ViewGraph::kMaxViewDepth; depth++) {
- while (MONGO_FAIL_POINT(hangDuringViewResolution)) {
- log() << "Yielding mutex and hanging due to 'hangDuringViewResolution' failpoint";
- lock.unlock();
- sleepmillis(1000);
- lock.lock();
- }
-
// If the catalog has been invalidated, bail and restart.
if (!_valid.load()) {
uassertStatusOK(_reloadIfNeeded(lock, opCtx));
View Lorry Controller Status