diff options
| author | Tess Avitabile <tess.avitabile@mongodb.com> | 2016-09-01 16:50:15 -0400 |
|---|---|---|
| committer | Tess Avitabile <tess.avitabile@mongodb.com> | 2016-09-02 10:22:35 -0400 |
| commit | 54488beeea99b3046931109c170d7e51cea0964d (patch) | |
| tree | 857ef9804616dd4b0ab928816c8f757717b65865 /src/mongo | |
| parent | 03b26cf2e15deb65326f7be7d0b5a94f7ca5471c (diff) | |
| download | mongo-54488beeea99b3046931109c170d7e51cea0964d.tar.gz | |
SERVER-25937 Writing to system.views collection should not error when featureCompatibilityVersion is 3.2
Diffstat (limited to 'src/mongo')
| -rw-r--r-- | src/mongo/db/op_observer.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/db/views/durable_view_catalog.cpp | 9 | ||||
| -rw-r--r-- | src/mongo/db/views/durable_view_catalog.h | 5 |
3 files changed, 0 insertions, 16 deletions
diff --git a/src/mongo/db/op_observer.cpp b/src/mongo/db/op_observer.cpp index f3e1a3729c8..8defc1c71fe 100644 --- a/src/mongo/db/op_observer.cpp +++ b/src/mongo/db/op_observer.cpp @@ -91,7 +91,6 @@ void OpObserver::onInserts(OperationContext* txn, } if (nss.coll() == DurableViewCatalog::viewsCollectionName()) { DurableViewCatalog::onExternalChange(txn, nss); - DurableViewCatalog::confirm34FeatureCompatibilityVersion(); } } @@ -118,7 +117,6 @@ void OpObserver::onUpdate(OperationContext* txn, const OplogUpdateEntryArgs& arg NamespaceString nss(args.ns); if (nss.coll() == DurableViewCatalog::viewsCollectionName()) { DurableViewCatalog::onExternalChange(txn, nss); - DurableViewCatalog::confirm34FeatureCompatibilityVersion(); } if (args.ns == FeatureCompatibilityVersion::kCollection) { diff --git a/src/mongo/db/views/durable_view_catalog.cpp b/src/mongo/db/views/durable_view_catalog.cpp index 7f7648160df..ba84432b7cf 100644 --- a/src/mongo/db/views/durable_view_catalog.cpp +++ b/src/mongo/db/views/durable_view_catalog.cpp @@ -59,15 +59,6 @@ void DurableViewCatalog::onExternalChange(OperationContext* txn, const Namespace } } -void DurableViewCatalog::confirm34FeatureCompatibilityVersion() { - uassert(40307, - "Cannot perform inserts or updates on system.views collection when " - "the featureCompatibilityVersion is 3.2. See " - "http://dochub.mongodb.org/core/3.4-feature-compatibility.", - serverGlobalParams.featureCompatibilityVersion.load() != - ServerGlobalParams::FeatureCompatibilityVersion_32); -} - // DurableViewCatalogImpl const std::string& DurableViewCatalogImpl::getName() const { diff --git a/src/mongo/db/views/durable_view_catalog.h b/src/mongo/db/views/durable_view_catalog.h index 6ad323198e2..fa94911af53 100644 --- a/src/mongo/db/views/durable_view_catalog.h +++ b/src/mongo/db/views/durable_view_catalog.h @@ -58,11 +58,6 @@ public: */ static void onExternalChange(OperationContext* txn, const NamespaceString& name); - /** - * Throws if featureCompatibilityVersion is 3.2. - */ - static void confirm34FeatureCompatibilityVersion(); - using Callback = stdx::function<void(const BSONObj& view)>; virtual Status iterate(OperationContext* txn, Callback callback) = 0; virtual void upsert(OperationContext* txn, |