Commit bb2c4daa authored by tzik@chromium.org's avatar tzik@chromium.org

Add database recovery for FileSystemDirectoryDatabase.

BUG=103018,116615
TEST='FileSystemDirectoryDatabaseTest.*'

Review URL: https://chromiumcodereview.appspot.com/9910005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132369 0039d316-1c4b-4281-b951-d872f2087c98
parent 740c1455
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "webkit/fileapi/file_system_database_test_helper.h"
#include <algorithm>
#include <functional>
#include <vector>
#include "base/file_util.h"
#include "base/stl_util.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/fileapi/file_system_util.h"
namespace fileapi {
void CorruptDatabase(const FilePath& db_path,
leveldb::FileType type,
ptrdiff_t offset,
size_t size) {
file_util::FileEnumerator file_enum(
db_path, false /* recursive */,
static_cast<file_util::FileEnumerator::FileType>(
file_util::FileEnumerator::DIRECTORIES |
file_util::FileEnumerator::FILES));
FilePath file_path;
FilePath picked_file_path;
uint64 picked_file_number = kuint64max;
while (!(file_path = file_enum.Next()).empty()) {
uint64 number = kuint64max;
leveldb::FileType file_type;
EXPECT_TRUE(leveldb::ParseFileName(FilePathToString(file_path.BaseName()),
&number, &file_type));
if (file_type == type &&
(picked_file_number == kuint64max || picked_file_number < number)) {
picked_file_path = file_path;
picked_file_number = number;
}
}
EXPECT_FALSE(picked_file_path.empty());
EXPECT_NE(kuint64max, picked_file_number);
bool created = true;
base::PlatformFileError error = base::PLATFORM_FILE_ERROR_FAILED;
base::PlatformFile file =
CreatePlatformFile(picked_file_path,
base::PLATFORM_FILE_OPEN |
base::PLATFORM_FILE_READ |
base::PLATFORM_FILE_WRITE,
&created, &error);
EXPECT_EQ(base::PLATFORM_FILE_OK, error);
EXPECT_FALSE(created);
base::PlatformFileInfo file_info;
EXPECT_TRUE(base::GetPlatformFileInfo(file, &file_info));
if (offset < 0)
offset += file_info.size;
EXPECT_GE(offset, 0);
EXPECT_LE(offset, file_info.size);
size = std::min(size, static_cast<size_t>(file_info.size - offset));
std::vector<char> buf(size);
int read_size = base::ReadPlatformFile(file, offset,
vector_as_array(&buf), buf.size());
EXPECT_LT(0, read_size);
EXPECT_GE(buf.size(), static_cast<size_t>(read_size));
buf.resize(read_size);
std::transform(buf.begin(), buf.end(), buf.begin(),
std::logical_not<char>());
int written_size = base::WritePlatformFile(file, offset,
vector_as_array(&buf), buf.size());
EXPECT_GT(written_size, 0);
EXPECT_EQ(buf.size(), static_cast<size_t>(written_size));
base::ClosePlatformFile(file);
}
} // namespace fileapi
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef WEBKIT_FILEAPI_FILE_SYSTEM_DATABASE_TEST_HELPER_H_
#define WEBKIT_FILEAPI_FILE_SYSTEM_DATABASE_TEST_HELPER_H_
#include <cstddef>
#include "third_party/leveldatabase/src/db/filename.h"
class FilePath;
namespace fileapi {
void CorruptDatabase(const FilePath& db_path,
leveldb::FileType type,
ptrdiff_t offset,
size_t size);
} // namespace fileapi
#endif // WEBKIT_FILEAPI_FILE_SYSTEM_DATABASE_TEST_HELPER_H_
......@@ -32,8 +32,6 @@ namespace fileapi {
// TODO(ericu): Safe mode, which does more checks such as the above on debug
// builds.
// TODO(ericu): FSCK, for a full-database check [data file validation possibly
// done elsewhere].
// TODO(ericu): Add a method that will give a unique filename for a data file.
class FileSystemDirectoryDatabase {
public:
......@@ -86,15 +84,22 @@ class FileSystemDirectoryDatabase {
// creation/destruction of FileSystemDirectoryDatabase objects.
bool GetNextInteger(int64* next);
// Returns true if the database looks consistent with local filesystem.
bool IsFileSystemConsistent();
static bool DestroyDatabase(const FilePath& path);
private:
enum RecoveryOption {
DELETE_ON_CORRUPTION,
REPAIR_ON_CORRUPTION,
FAIL_ON_CORRUPTION,
};
friend class FileSystemDirectoryDatabaseTest;
bool Init(RecoveryOption recovery_option);
bool RepairDatabase(const std::string& db_path);
void ReportInitStatus(const leveldb::Status& status);
bool StoreDefaultValues();
bool GetLastFileId(FileId* file_id);
......
......@@ -6,14 +6,25 @@
#include <math.h>
#include "base/file_util.h"
#include "base/platform_file.h"
#include "base/memory/scoped_ptr.h"
#include "base/scoped_temp_dir.h"
#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/leveldatabase/src/include/leveldb/db.h"
#include "webkit/fileapi/file_system_database_test_helper.h"
#include "webkit/fileapi/file_system_util.h"
#define FPL(x) FILE_PATH_LITERAL(x)
namespace fileapi {
namespace {
const FilePath::CharType kDirectoryDatabaseName[] = FPL("Paths");
}
class FileSystemDirectoryDatabaseTest : public testing::Test {
public:
typedef FileSystemDirectoryDatabase::FileId FileId;
......@@ -29,10 +40,14 @@ class FileSystemDirectoryDatabaseTest : public testing::Test {
}
void InitDatabase() {
// First reset() is to avoid multiple database instance for single
// directory at once.
// Call CloseDatabase() to avoid having multiple database instances for
// single directory at once.
CloseDatabase();
db_.reset(new FileSystemDirectoryDatabase(path()));
}
void CloseDatabase() {
db_.reset();
db_.reset(new FileSystemDirectoryDatabase(base_.path()));
}
bool AddFileInfo(FileId parent_id, const FilePath::StringType& name) {
......@@ -43,6 +58,87 @@ class FileSystemDirectoryDatabaseTest : public testing::Test {
return db_->AddFileInfo(info, &file_id);
}
void CreateDirectory(FileId parent_id,
const FilePath::StringType& name,
FileId* file_id_out) {
FileId file_id;
FileInfo info;
info.parent_id = parent_id;
info.name = name;
ASSERT_TRUE(db_->AddFileInfo(info, &file_id));
if (file_id_out)
*file_id_out = file_id;
}
void CreateFile(FileId parent_id,
const FilePath::StringType& name,
const FilePath::StringType& data_path,
FileId* file_id_out) {
FileId file_id;
FileInfo info;
info.parent_id = parent_id;
info.name = name;
info.data_path = FilePath(data_path).NormalizePathSeparators();
ASSERT_TRUE(db_->AddFileInfo(info, &file_id));
FilePath local_path = path().Append(data_path);
if (!file_util::DirectoryExists(local_path.DirName()))
ASSERT_TRUE(file_util::CreateDirectory(local_path.DirName()));
bool created = false;
base::PlatformFileError error = base::PLATFORM_FILE_ERROR_FAILED;
base::PlatformFile file = base::CreatePlatformFile(
local_path,
base::PLATFORM_FILE_CREATE | base::PLATFORM_FILE_WRITE,
&created, &error);
ASSERT_EQ(base::PLATFORM_FILE_OK, error);
ASSERT_TRUE(created);
ASSERT_TRUE(base::ClosePlatformFile(file));
if (file_id_out)
*file_id_out = file_id;
}
void ClearDatabaseAndDirectory() {
db_.reset();
ASSERT_TRUE(file_util::Delete(path(), true /* recursive */));
ASSERT_TRUE(file_util::CreateDirectory(path()));
db_.reset(new FileSystemDirectoryDatabase(path()));
}
bool RepairDatabase() {
return db()->RepairDatabase(
FilePathToString(path().Append(kDirectoryDatabaseName)));
}
const FilePath& path() {
return base_.path();
}
// Makes link from |parent_id| to |child_id| with |name|.
void MakeHierarchyLink(FileId parent_id,
FileId child_id,
const FilePath::StringType& name) {
ASSERT_TRUE(db()->db_->Put(
leveldb::WriteOptions(),
"CHILD_OF:" + base::Int64ToString(parent_id) + ":" +
FilePathToString(FilePath(name)),
base::Int64ToString(child_id)).ok());
}
// Deletes link from parent of |file_id| to |file_id|.
void DeleteHierarchyLink(FileId file_id) {
FileInfo file_info;
ASSERT_TRUE(db()->GetFileInfo(file_id, &file_info));
ASSERT_TRUE(db()->db_->Delete(
leveldb::WriteOptions(),
"CHILD_OF:" + base::Int64ToString(file_info.parent_id) + ":" +
FilePathToString(FilePath(file_info.name))).ok());
}
protected:
// Common temp base for nondestructive uses.
ScopedTempDir base_;
......@@ -403,7 +499,7 @@ TEST_F(FileSystemDirectoryDatabaseTest, TestOverwritingMoveFileSuccess) {
}
TEST_F(FileSystemDirectoryDatabaseTest, TestGetNextInteger) {
int64 next;
int64 next = -1;
EXPECT_TRUE(db()->GetNextInteger(&next));
EXPECT_EQ(0, next);
EXPECT_TRUE(db()->GetNextInteger(&next));
......@@ -418,4 +514,144 @@ TEST_F(FileSystemDirectoryDatabaseTest, TestGetNextInteger) {
EXPECT_EQ(4, next);
}
TEST_F(FileSystemDirectoryDatabaseTest, TestConsistencyCheck_Empty) {
EXPECT_TRUE(db()->IsFileSystemConsistent());
int64 next = -1;
EXPECT_TRUE(db()->GetNextInteger(&next));
EXPECT_EQ(0, next);
EXPECT_TRUE(db()->IsFileSystemConsistent());
}
TEST_F(FileSystemDirectoryDatabaseTest, TestConsistencyCheck_Consistent) {
FileId dir_id;
CreateFile(0, FPL("foo"), FPL("hoge"), NULL);
CreateDirectory(0, FPL("bar"), &dir_id);
CreateFile(dir_id, FPL("baz"), FPL("fuga"), NULL);
CreateFile(dir_id, FPL("fizz"), FPL("buzz"), NULL);
EXPECT_TRUE(db()->IsFileSystemConsistent());
}
TEST_F(FileSystemDirectoryDatabaseTest,
TestConsistencyCheck_BackingMultiEntry) {
const FilePath::CharType kBackingFileName[] = FPL("the celeb");
CreateFile(0, FPL("foo"), kBackingFileName, NULL);
EXPECT_TRUE(db()->IsFileSystemConsistent());
ASSERT_TRUE(file_util::Delete(path().Append(kBackingFileName), false));
CreateFile(0, FPL("bar"), kBackingFileName, NULL);
EXPECT_FALSE(db()->IsFileSystemConsistent());
}
TEST_F(FileSystemDirectoryDatabaseTest, TestConsistencyCheck_FileLost) {
const FilePath::CharType kBackingFileName[] = FPL("hoge");
CreateFile(0, FPL("foo"), kBackingFileName, NULL);
EXPECT_TRUE(db()->IsFileSystemConsistent());
ASSERT_TRUE(file_util::Delete(path().Append(kBackingFileName), false));
EXPECT_TRUE(db()->IsFileSystemConsistent());
}
TEST_F(FileSystemDirectoryDatabaseTest, TestConsistencyCheck_OrphanFile) {
CreateFile(0, FPL("foo"), FPL("hoge"), NULL);
EXPECT_TRUE(db()->IsFileSystemConsistent());
bool created = false;
base::PlatformFileError error = base::PLATFORM_FILE_ERROR_FAILED;
base::PlatformFile file = base::CreatePlatformFile(
path().Append(FPL("Orphan File")),
base::PLATFORM_FILE_CREATE | base::PLATFORM_FILE_WRITE,
&created, &error);
ASSERT_EQ(base::PLATFORM_FILE_OK, error);
ASSERT_TRUE(created);
ASSERT_TRUE(base::ClosePlatformFile(file));
EXPECT_TRUE(db()->IsFileSystemConsistent());
}
TEST_F(FileSystemDirectoryDatabaseTest, TestConsistencyCheck_RootLoop) {
EXPECT_TRUE(db()->IsFileSystemConsistent());
MakeHierarchyLink(0, 0, FPL(""));
EXPECT_FALSE(db()->IsFileSystemConsistent());
}
TEST_F(FileSystemDirectoryDatabaseTest, TestConsistencyCheck_DirectoryLoop) {
FileId dir1_id;
FileId dir2_id;
FilePath::StringType dir1_name = FPL("foo");
CreateDirectory(0, dir1_name, &dir1_id);
CreateDirectory(dir1_id, FPL("bar"), &dir2_id);
EXPECT_TRUE(db()->IsFileSystemConsistent());
MakeHierarchyLink(dir2_id, dir1_id, dir1_name);
EXPECT_FALSE(db()->IsFileSystemConsistent());
}
TEST_F(FileSystemDirectoryDatabaseTest, TestConsistencyCheck_NameMismatch) {
FileId dir_id;
FileId file_id;
CreateDirectory(0, FPL("foo"), &dir_id);
CreateFile(dir_id, FPL("bar"), FPL("hoge/fuga/piyo"), &file_id);
EXPECT_TRUE(db()->IsFileSystemConsistent());
DeleteHierarchyLink(file_id);
MakeHierarchyLink(dir_id, file_id, FPL("baz"));
EXPECT_FALSE(db()->IsFileSystemConsistent());
}
TEST_F(FileSystemDirectoryDatabaseTest, TestConsistencyCheck_WreckedEntries) {
FileId dir1_id;
FileId dir2_id;
CreateDirectory(0, FPL("foo"), &dir1_id);
CreateDirectory(dir1_id, FPL("bar"), &dir2_id);
CreateFile(dir2_id, FPL("baz"), FPL("fizz/buzz"), NULL);
EXPECT_TRUE(db()->IsFileSystemConsistent());
DeleteHierarchyLink(dir2_id); // Delete link from |dir1_id| to |dir2_id|.
EXPECT_FALSE(db()->IsFileSystemConsistent());
}
TEST_F(FileSystemDirectoryDatabaseTest, TestRepairDatabase_Success) {
FilePath::StringType kFileName = FPL("bar");
FileId file_id_prev;
CreateFile(0, FPL("foo"), FPL("hoge"), NULL);
CreateFile(0, kFileName, FPL("fuga"), &file_id_prev);
const FilePath kDatabaseDirectory = path().Append(kDirectoryDatabaseName);
CloseDatabase();
CorruptDatabase(kDatabaseDirectory, leveldb::kDescriptorFile,
0, std::numeric_limits<size_t>::max());
InitDatabase();
EXPECT_FALSE(db()->IsFileSystemConsistent());
FileId file_id;
EXPECT_TRUE(db()->GetChildWithName(0, kFileName, &file_id));
EXPECT_EQ(file_id_prev, file_id);
EXPECT_TRUE(db()->IsFileSystemConsistent());
}
TEST_F(FileSystemDirectoryDatabaseTest, TestRepairDatabase_Failure) {
FilePath::StringType kFileName = FPL("bar");
CreateFile(0, FPL("foo"), FPL("hoge"), NULL);
CreateFile(0, kFileName, FPL("fuga"), NULL);
const FilePath kDatabaseDirectory = path().Append(kDirectoryDatabaseName);
CloseDatabase();
CorruptDatabase(kDatabaseDirectory, leveldb::kDescriptorFile,
0, std::numeric_limits<size_t>::max());
CorruptDatabase(kDatabaseDirectory, leveldb::kLogFile,
-1, 1);
InitDatabase();
EXPECT_FALSE(db()->IsFileSystemConsistent());
FileId file_id;
EXPECT_FALSE(db()->GetChildWithName(0, kFileName, &file_id));
EXPECT_TRUE(db()->IsFileSystemConsistent());
}
} // namespace fileapi
......@@ -15,83 +15,16 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/leveldatabase/src/db/filename.h"
#include "third_party/leveldatabase/src/include/leveldb/db.h"
#include "webkit/fileapi/file_system_database_test_helper.h"
#include "webkit/fileapi/file_system_origin_database.h"
#include "webkit/fileapi/file_system_util.h"
namespace fileapi {
namespace {
const FilePath::CharType kFileSystemDirName[] =
FILE_PATH_LITERAL("File System");
const FilePath::CharType kOriginDatabaseName[] = FILE_PATH_LITERAL("Origins");
void CorruptDatabase(const FilePath& db_path,
leveldb::FileType type,
ptrdiff_t offset,
size_t size) {
file_util::FileEnumerator file_enum(
db_path, false /* recursive */,
static_cast<file_util::FileEnumerator::FileType>(
file_util::FileEnumerator::DIRECTORIES |
file_util::FileEnumerator::FILES));
FilePath file_path;
FilePath picked_file_path;
uint64 picked_file_number = kuint64max;
while (!(file_path = file_enum.Next()).empty()) {
uint64 number = kuint64max;
leveldb::FileType file_type;
EXPECT_TRUE(leveldb::ParseFileName(FilePathToString(file_path.BaseName()),
&number, &file_type));
if (file_type == type &&
(picked_file_number == kuint64max || picked_file_number < number)) {
picked_file_path = file_path;
picked_file_number = number;
}
}
EXPECT_FALSE(picked_file_path.empty());
EXPECT_NE(kuint64max, picked_file_number);
bool created = true;
base::PlatformFileError error = base::PLATFORM_FILE_ERROR_FAILED;
base::PlatformFile file =
CreatePlatformFile(picked_file_path,
base::PLATFORM_FILE_OPEN |
base::PLATFORM_FILE_READ |
base::PLATFORM_FILE_WRITE,
&created, &error);
EXPECT_EQ(base::PLATFORM_FILE_OK, error);
EXPECT_FALSE(created);
base::PlatformFileInfo file_info;
EXPECT_TRUE(base::GetPlatformFileInfo(file, &file_info));
if (offset < 0)
offset += file_info.size;
EXPECT_GE(offset, 0);
EXPECT_LE(offset, file_info.size);
size = std::min(size, static_cast<size_t>(file_info.size - offset));
std::vector<char> buf(size);
int read_size = base::ReadPlatformFile(file, offset,
vector_as_array(&buf), buf.size());
EXPECT_LT(0, read_size);
EXPECT_GE(buf.size(), static_cast<size_t>(read_size));
buf.resize(read_size);
std::transform(buf.begin(), buf.end(), buf.begin(),
std::logical_not<char>());
int written_size = base::WritePlatformFile(file, offset,
vector_as_array(&buf), buf.size());
EXPECT_GT(written_size, 0);
EXPECT_EQ(buf.size(), static_cast<size_t>(written_size));
base::ClosePlatformFile(file);
}
} // namespace
TEST(FileSystemOriginDatabaseTest, BasicTest) {
......
......@@ -10,7 +10,8 @@
namespace fileapi {
const char FileSystemUsageCache::kUsageFileName[] = ".usage";
const FilePath::CharType FileSystemUsageCache::kUsageFileName[] =
FILE_PATH_LITERAL(".usage");
const char FileSystemUsageCache::kUsageFileHeader[] = "FSU4";
const int FileSystemUsageCache::kUsageFileHeaderSize = 4;
......
......@@ -42,7 +42,7 @@ class FileSystemUsageCache {
static bool Exists(const FilePath& usage_file_path);
static bool Delete(const FilePath& usage_file_path);
static const char kUsageFileName[];
static const FilePath::CharType kUsageFileName[];
static const char kUsageFileHeader[];
static const int kUsageFileSize;
static const int kUsageFileHeaderSize;
......
......@@ -21,7 +21,7 @@ class FileSystemUsageCacheTest : public testing::Test {
protected:
FilePath GetUsageFilePath() {
return data_dir_.path().AppendASCII(FileSystemUsageCache::kUsageFileName);
return data_dir_.path().Append(FileSystemUsageCache::kUsageFileName);
}
private:
......
......@@ -522,7 +522,7 @@ int64 SandboxMountPointProvider::GetOriginUsageOnFileThread(
GetBaseDirectoryForOriginAndType(origin_url, type, false);
if (base_path.empty() || !file_util::DirectoryExists(base_path)) return 0;
FilePath usage_file_path =
base_path.AppendASCII(FileSystemUsageCache::kUsageFileName);
base_path.Append(FileSystemUsageCache::kUsageFileName);
bool is_valid = FileSystemUsageCache::IsValid(usage_file_path);
int32 dirty_status = FileSystemUsageCache::GetDirty(usage_file_path);
......@@ -621,7 +621,7 @@ FilePath SandboxMountPointProvider::GetUsageCachePathForOriginAndType(
GetBaseDirectoryForOriginAndType(origin_url, type, false);
if (base_path.empty())
return FilePath();
return base_path.AppendASCII(FileSystemUsageCache::kUsageFileName);
return base_path.Append(FileSystemUsageCache::kUsageFileName);
}
FilePath SandboxMountPointProvider::OldCreateFileSystemRootPath(
......
......@@ -407,6 +407,8 @@
'../../dom_storage/dom_storage_context_unittest.cc',
'../../dom_storage/dom_storage_database_unittest.cc',
'../../dom_storage/dom_storage_map_unittest.cc',
'../../fileapi/file_system_database_test_helper.cc',
'../../fileapi/file_system_database_test_helper.h',
'../../fileapi/file_system_directory_database_unittest.cc',
'../../fileapi/file_system_file_util_unittest.cc',
'../../fileapi/file_system_mount_point_provider_unittest.cc',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment