SERVER-16567 removed StorageEngineMetadata::updateIfMissing

3 files changed, 0 insertions, 63 deletions

diff --git a/src/mongo/db/storage/storage_engine_metadata.cpp b/src/mongo/db/storage/storage_engine_metadata.cpp
index 8360418f112..9bde824bc23 100644
--- a/src/mongo/db/storage/storage_engine_metadata.cpp
+++ b/src/mongo/db/storage/storage_engine_metadata.cpp
@@ -99,26 +99,6 @@ namespace {
         return metadata;
     }
 
-    // static
-    Status StorageEngineMetadata::updateIfMissing(const std::string& dbpath,
-                                                  const std::string& storageEngine) {
-        boost::filesystem::path metadataPath =
-            boost::filesystem::path(dbpath) / kMetadataBasename;
-
-        if (boost::filesystem::exists(metadataPath)) {
-            return Status::OK();
-        }
-
-        StorageEngineMetadata metadata(dbpath);
-        metadata.setStorageEngine(storageEngine);
-        Status status = metadata.write();
-        if (!status.isOK()) {
-            warning() << "Unable to update storage engine metadata in " << dbpath
-                      << ": " << status.toString();
-        }
-        return status;
-    }
-
     StorageEngineMetadata::StorageEngineMetadata(const std::string& dbpath)
         : _dbpath(dbpath) {
         reset();
diff --git a/src/mongo/db/storage/storage_engine_metadata.h b/src/mongo/db/storage/storage_engine_metadata.h
index adbbdee4175..be030749b38 100644
--- a/src/mongo/db/storage/storage_engine_metadata.h
+++ b/src/mongo/db/storage/storage_engine_metadata.h
@@ -66,14 +66,6 @@ namespace mongo {
                                                              const std::string& storageEngine);
 
         /**
-         * Writes a new metadata file in the data directory if it's missing.
-         * Returns OK if the metadata exists, or if it's missing and there was no
-         * issue overwriting it.
-         * Otherwise, returns status from  write().
-         */
-        static Status updateIfMissing(const std::string& dbpath, const std::string& storageEngine);
-
-        /**
          * Sets fields to defaults.
          * Use read() load metadata from file.
          */
diff --git a/src/mongo/db/storage/storage_engine_metadata_test.cpp b/src/mongo/db/storage/storage_engine_metadata_test.cpp
index 7f516f02582..d132c556220 100644
--- a/src/mongo/db/storage/storage_engine_metadata_test.cpp
+++ b/src/mongo/db/storage/storage_engine_metadata_test.cpp
@@ -329,41 +329,6 @@ namespace {
         ASSERT_THROWS(StorageEngineMetadata::validate(tempDir.path(), "engine2"), UserException);
     }
 
-    TEST(StorageEngineMetadataTest, UpdateIfMissingNoExistingMetadata) {
-        TempDir tempDir("StorageEngineMetadataTest_UpdateIfMissingNoExistingMetadata");
-        ASSERT_OK(StorageEngineMetadata::updateIfMissing(tempDir.path(), "storageEngine1"));
-        // Read back storage engine name.
-        {
-            StorageEngineMetadata metadata(tempDir.path());
-            ASSERT_OK(metadata.read());
-            ASSERT_EQUALS("storageEngine1", metadata.getStorageEngine());
-        }
-    }
-
-    // Do not overwrite existing metadata file.
-    TEST(StorageEngineMetadataTest, UpdateIfMissingMetadataExists) {
-        TempDir tempDir("StorageEngineMetadataTest_UpdateIfMissingMetadataExists");
-        {
-            StorageEngineMetadata metadata(tempDir.path());
-            metadata.setStorageEngine("storageEngine1");
-            ASSERT_OK(metadata.write());
-        }
-        // Invoke update() with a different storage engine name.
-        // This should not modify the existings file.
-        ASSERT_OK(StorageEngineMetadata::updateIfMissing(tempDir.path(), "storageEngine2"));
-        // Read back storage engine name.
-        {
-            StorageEngineMetadata metadata(tempDir.path());
-            ASSERT_OK(metadata.read());
-            ASSERT_EQUALS("storageEngine1", metadata.getStorageEngine());
-        }
-    }
-
-    TEST(StorageEngineMetadataTest, UpdateIfMissingInvalidDirectory) {
-        // Should warn and return write() status if we fail to update the metadata file.
-        ASSERT_NOT_OK(StorageEngineMetadata::updateIfMissing("no_such_directory", "engine1"));
-    }
-
     TEST(StorageEngineMetadataTest, ValidateStorageEngineOption) {
         // It is fine to provide an invalid data directory as long as we do not
         // call read() or write().