Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 13 insertions, 38 deletions

diff --git a/src/mongo/db/storage/storage_engine_init.cpp b/src/mongo/db/storage/storage_engine_init.cpp
index f16cb0e3c2d..7c345ddcfe6 100644
--- a/src/mongo/db/storage/storage_engine_init.cpp
+++ b/src/mongo/db/storage/storage_engine_init.cpp
@@ -39,7 +39,6 @@
 #include "mongo/base/init.h"
 #include "mongo/bson/bsonobjbuilder.h"
 #include "mongo/db/concurrency/lock_state.h"
-#include "mongo/db/exec/scoped_timer.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/storage/control/storage_control.h"
 #include "mongo/db/storage/recovery_unit_noop.h"
@@ -66,10 +65,8 @@ namespace {
 void createLockFile(ServiceContext* service);
 }  // namespace
 
-StorageEngine::LastShutdownState initializeStorageEngine(
-    OperationContext* opCtx,
-    const StorageEngineInitFlags initFlags,
-    BSONObjBuilder* startupTimeElapsedBuilder) {
+StorageEngine::LastShutdownState initializeStorageEngine(OperationContext* opCtx,
+                                                         const StorageEngineInitFlags initFlags) {
     ServiceContext* service = opCtx->getServiceContext();
 
     if (storageGlobalParams.restore) {
@@ -83,10 +80,6 @@ StorageEngine::LastShutdownState initializeStorageEngine(
         invariant(!service->getStorageEngine());
 
     if ((initFlags & StorageEngineInitFlags::kAllowNoLockFile) == StorageEngineInitFlags{}) {
-        auto scopedTimer = createTimeElapsedBuilderScopedTimer(
-            service->getFastClockSource(),
-            "Create storage engine lock file in the data directory",
-            startupTimeElapsedBuilder);
         createLockFile(service);
     }
 
@@ -151,10 +144,6 @@ StorageEngine::LastShutdownState initializeStorageEngine(
 
     std::unique_ptr<StorageEngineMetadata> metadata;
     if ((initFlags & StorageEngineInitFlags::kSkipMetadataFile) == StorageEngineInitFlags{}) {
-        auto scopedTimer =
-            createTimeElapsedBuilderScopedTimer(service->getFastClockSource(),
-                                                "Get metadata describing storage engine",
-                                                startupTimeElapsedBuilder);
         metadata = StorageEngineMetadata::forPath(dbpath);
     }
 
@@ -167,10 +156,6 @@ StorageEngine::LastShutdownState initializeStorageEngine(
 
     // Validate options in metadata against current startup options.
     if (metadata.get()) {
-        auto scopedTimer = createTimeElapsedBuilderScopedTimer(
-            service->getFastClockSource(),
-            "Validate options in metadata against current startup options",
-            startupTimeElapsedBuilder);
         uassertStatusOK(factory->validateMetadata(*metadata, storageGlobalParams));
     }
 
@@ -216,26 +201,20 @@ StorageEngine::LastShutdownState initializeStorageEngine(
     });
 
     auto& lockFile = StorageEngineLockFile::get(service);
-    {
-        auto scopedTimer = createTimeElapsedBuilderScopedTimer(
-            service->getFastClockSource(), "Create storage engine", startupTimeElapsedBuilder);
-        if ((initFlags & StorageEngineInitFlags::kForRestart) == StorageEngineInitFlags{}) {
-            auto storageEngine = std::unique_ptr<StorageEngine>(
-                factory->create(opCtx, storageGlobalParams, lockFile ? &*lockFile : nullptr));
-            service->setStorageEngine(std::move(storageEngine));
-        } else {
-            auto storageEngineChangeContext = StorageEngineChangeContext::get(service);
-            auto token = storageEngineChangeContext->killOpsForStorageEngineChange(service);
-            auto storageEngine = std::unique_ptr<StorageEngine>(
-                factory->create(opCtx, storageGlobalParams, lockFile ? &*lockFile : nullptr));
-            storageEngineChangeContext->changeStorageEngine(
-                service, std::move(token), std::move(storageEngine));
-        }
+    if ((initFlags & StorageEngineInitFlags::kForRestart) == StorageEngineInitFlags{}) {
+        auto storageEngine = std::unique_ptr<StorageEngine>(
+            factory->create(opCtx, storageGlobalParams, lockFile ? &*lockFile : nullptr));
+        service->setStorageEngine(std::move(storageEngine));
+    } else {
+        auto storageEngineChangeContext = StorageEngineChangeContext::get(service);
+        auto token = storageEngineChangeContext->killOpsForStorageEngineChange(service);
+        auto storageEngine = std::unique_ptr<StorageEngine>(
+            factory->create(opCtx, storageGlobalParams, lockFile ? &*lockFile : nullptr));
+        storageEngineChangeContext->changeStorageEngine(
+            service, std::move(token), std::move(storageEngine));
     }
 
     if (lockFile) {
-        auto scopedTimer = createTimeElapsedBuilderScopedTimer(
-            service->getFastClockSource(), "Write current PID to file", startupTimeElapsedBuilder);
         uassertStatusOK(lockFile->writePid());
     }
 
@@ -243,10 +222,6 @@ StorageEngine::LastShutdownState initializeStorageEngine(
     if (!metadata.get() &&
         (initFlags & StorageEngineInitFlags::kSkipMetadataFile) == StorageEngineInitFlags{}) {
         invariant(!storageGlobalParams.readOnly);
-        auto scopedTimer =
-            createTimeElapsedBuilderScopedTimer(service->getFastClockSource(),
-                                                "Write a new metadata for storage engine",
-                                                startupTimeElapsedBuilder);
         metadata.reset(new StorageEngineMetadata(storageGlobalParams.dbpath));
         metadata->setStorageEngine(factory->getCanonicalName().toString());
         metadata->setStorageEngineOptions(factory->createMetadataOptions(storageGlobalParams));