summaryrefslogtreecommitdiff
path: root/src/mongo/db/storage
diff options
context:
space:
mode:
authorLouis Williams <louis.williams@mongodb.com>2019-05-22 15:00:32 -0400
committerLouis Williams <louis.williams@mongodb.com>2019-05-22 15:00:32 -0400
commitb43f3865a7f0c84c10e02261187b5759072fabeb (patch)
treef19edc53717a0d4aa8c961276530c569dee6f38d /src/mongo/db/storage
parente9753b56fe3f7e5c3e783f31d3ed5fe7afb8f641 (diff)
downloadmongo-b43f3865a7f0c84c10e02261187b5759072fabeb.tar.gz
Revert "SERVER-41254 Turn on write-ahead logging for hybrid index side tables"
This reverts commit f88af354d7c59c1eda232a10a7781a181f5c3aaa.
Diffstat (limited to 'src/mongo/db/storage')
-rw-r--r--src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp
index ef8f006160b..3fbe0726632 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store.cpp
@@ -620,9 +620,9 @@ StatusWith<std::string> WiredTigerRecordStore::generateCreateString(
bool replicatedWrites = getGlobalReplSettings().usingReplSets() ||
repl::ReplSettings::shouldRecoverFromOplogAsStandalone();
- // Journal writes when 'ns' is an empty string, which is the case for internal-only temporary
- // tables. This is for improved diagnostics.
- if (!ns.size() || WiredTigerUtil::useTableLogging(NamespaceString(ns), replicatedWrites)) {
+ // Do not journal writes when 'ns' is an empty string, which is the case for internal-only
+ // temporary tables.
+ if (ns.size() && WiredTigerUtil::useTableLogging(NamespaceString(ns), replicatedWrites)) {
ss << ",log=(enabled=true)";
} else {
ss << ",log=(enabled=false)";
@@ -675,12 +675,11 @@ WiredTigerRecordStore::WiredTigerRecordStore(WiredTigerKVEngine* kvEngine,
invariant(_cappedMaxDocs == -1);
}
- if (!params.isReadOnly) {
+ if (!params.isReadOnly && !isTemp()) {
bool replicatedWrites = getGlobalReplSettings().usingReplSets() ||
repl::ReplSettings::shouldRecoverFromOplogAsStandalone();
- bool useLogging =
- isTemp() || WiredTigerUtil::useTableLogging(NamespaceString(ns()), replicatedWrites);
- uassertStatusOK(WiredTigerUtil::setTableLogging(ctx, _uri, useLogging));
+ uassertStatusOK(WiredTigerUtil::setTableLogging(
+ ctx, _uri, WiredTigerUtil::useTableLogging(NamespaceString(ns()), replicatedWrites)));
}
if (_isOplog) {