|
|
|
// Copyright (c) 2011-present, Facebook, Inc. All rights reserved.
|
|
|
|
// This source code is licensed under both the GPLv2 (found in the
|
|
|
|
// COPYING file in the root directory) and Apache 2.0 License
|
|
|
|
// (found in the LICENSE.Apache file in the root directory).
|
|
|
|
//
|
|
|
|
// Copyright (c) 2011 The LevelDB Authors. All rights reserved.
|
|
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
|
|
// found in the LICENSE file. See the AUTHORS file for names of contributors.
|
|
|
|
|
|
|
|
#include "db/version_builder.h"
|
|
|
|
|
|
|
|
#include <algorithm>
|
|
|
|
#include <atomic>
|
|
|
|
#include <cinttypes>
|
|
|
|
#include <functional>
|
|
|
|
#include <map>
|
Add blob files to VersionStorageInfo/VersionBuilder (#6597)
Summary:
The patch adds a couple of classes to represent metadata about
blob files: `SharedBlobFileMetaData` contains the information elements
that are immutable (once the blob file is closed), e.g. blob file number,
total number and size of blob files, checksum method/value, while
`BlobFileMetaData` contains attributes that can vary across versions like
the amount of garbage in the file. There is a single `SharedBlobFileMetaData`
for each blob file, which is jointly owned by the `BlobFileMetaData` objects
that point to it; `BlobFileMetaData` objects, in turn, are owned by `Version`s
and can also be shared if the (immutable _and_ mutable) state of the blob file
is the same in two versions.
In addition, the patch adds the blob file metadata to `VersionStorageInfo`, and extends
`VersionBuilder` so that it can apply blob file related `VersionEdit`s (i.e. those
containing `BlobFileAddition`s and/or `BlobFileGarbage`), and save blob file metadata
to a new `VersionStorageInfo`. Consistency checks are also extended to ensure
that table files point to blob files that are part of the `Version`, and that all blob files
that are part of any given `Version` have at least some _non_-garbage data in them.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6597
Test Plan: `make check`
Reviewed By: riversand963
Differential Revision: D20656803
Pulled By: ltamasi
fbshipit-source-id: f1f74d135045b3b42d0146f03ee576ef0a4bfd80
5 years ago
|
|
|
#include <memory>
|
|
|
|
#include <set>
|
Add blob files to VersionStorageInfo/VersionBuilder (#6597)
Summary:
The patch adds a couple of classes to represent metadata about
blob files: `SharedBlobFileMetaData` contains the information elements
that are immutable (once the blob file is closed), e.g. blob file number,
total number and size of blob files, checksum method/value, while
`BlobFileMetaData` contains attributes that can vary across versions like
the amount of garbage in the file. There is a single `SharedBlobFileMetaData`
for each blob file, which is jointly owned by the `BlobFileMetaData` objects
that point to it; `BlobFileMetaData` objects, in turn, are owned by `Version`s
and can also be shared if the (immutable _and_ mutable) state of the blob file
is the same in two versions.
In addition, the patch adds the blob file metadata to `VersionStorageInfo`, and extends
`VersionBuilder` so that it can apply blob file related `VersionEdit`s (i.e. those
containing `BlobFileAddition`s and/or `BlobFileGarbage`), and save blob file metadata
to a new `VersionStorageInfo`. Consistency checks are also extended to ensure
that table files point to blob files that are part of the `Version`, and that all blob files
that are part of any given `Version` have at least some _non_-garbage data in them.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6597
Test Plan: `make check`
Reviewed By: riversand963
Differential Revision: D20656803
Pulled By: ltamasi
fbshipit-source-id: f1f74d135045b3b42d0146f03ee576ef0a4bfd80
5 years ago
|
|
|
#include <sstream>
|
|
|
|
#include <thread>
|
|
|
|
#include <unordered_map>
|
|
|
|
#include <unordered_set>
|
|
|
|
#include <utility>
|
|
|
|
#include <vector>
|
|
|
|
|
Add blob files to VersionStorageInfo/VersionBuilder (#6597)
Summary:
The patch adds a couple of classes to represent metadata about
blob files: `SharedBlobFileMetaData` contains the information elements
that are immutable (once the blob file is closed), e.g. blob file number,
total number and size of blob files, checksum method/value, while
`BlobFileMetaData` contains attributes that can vary across versions like
the amount of garbage in the file. There is a single `SharedBlobFileMetaData`
for each blob file, which is jointly owned by the `BlobFileMetaData` objects
that point to it; `BlobFileMetaData` objects, in turn, are owned by `Version`s
and can also be shared if the (immutable _and_ mutable) state of the blob file
is the same in two versions.
In addition, the patch adds the blob file metadata to `VersionStorageInfo`, and extends
`VersionBuilder` so that it can apply blob file related `VersionEdit`s (i.e. those
containing `BlobFileAddition`s and/or `BlobFileGarbage`), and save blob file metadata
to a new `VersionStorageInfo`. Consistency checks are also extended to ensure
that table files point to blob files that are part of the `Version`, and that all blob files
that are part of any given `Version` have at least some _non_-garbage data in them.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6597
Test Plan: `make check`
Reviewed By: riversand963
Differential Revision: D20656803
Pulled By: ltamasi
fbshipit-source-id: f1f74d135045b3b42d0146f03ee576ef0a4bfd80
5 years ago
|
|
|
#include "db/blob/blob_file_meta.h"
|
|
|
|
#include "db/dbformat.h"
|
|
|
|
#include "db/internal_stats.h"
|
|
|
|
#include "db/table_cache.h"
|
|
|
|
#include "db/version_set.h"
|
|
|
|
#include "port/port.h"
|
|
|
|
#include "table/table_reader.h"
|
|
|
|
#include "util/string_util.h"
|
|
|
|
|
|
|
|
namespace ROCKSDB_NAMESPACE {
|
|
|
|
|
|
|
|
bool NewestFirstBySeqNo(FileMetaData* a, FileMetaData* b) {
|
|
|
|
if (a->fd.largest_seqno != b->fd.largest_seqno) {
|
|
|
|
return a->fd.largest_seqno > b->fd.largest_seqno;
|
|
|
|
}
|
|
|
|
if (a->fd.smallest_seqno != b->fd.smallest_seqno) {
|
|
|
|
return a->fd.smallest_seqno > b->fd.smallest_seqno;
|
|
|
|
}
|
|
|
|
// Break ties by file number
|
|
|
|
return a->fd.GetNumber() > b->fd.GetNumber();
|
|
|
|
}
|
|
|
|
|
|
|
|
namespace {
|
|
|
|
bool BySmallestKey(FileMetaData* a, FileMetaData* b,
|
|
|
|
const InternalKeyComparator* cmp) {
|
|
|
|
int r = cmp->Compare(a->smallest, b->smallest);
|
|
|
|
if (r != 0) {
|
|
|
|
return (r < 0);
|
|
|
|
}
|
|
|
|
// Break ties by file number
|
|
|
|
return (a->fd.GetNumber() < b->fd.GetNumber());
|
|
|
|
}
|
|
|
|
} // namespace
|
|
|
|
|
|
|
|
class VersionBuilder::Rep {
|
|
|
|
private:
|
|
|
|
// Helper to sort files_ in v
|
|
|
|
// kLevel0 -- NewestFirstBySeqNo
|
|
|
|
// kLevelNon0 -- BySmallestKey
|
|
|
|
struct FileComparator {
|
|
|
|
enum SortMethod { kLevel0 = 0, kLevelNon0 = 1, } sort_method;
|
|
|
|
const InternalKeyComparator* internal_comparator;
|
|
|
|
|
|
|
|
FileComparator() : internal_comparator(nullptr) {}
|
|
|
|
|
|
|
|
bool operator()(FileMetaData* f1, FileMetaData* f2) const {
|
|
|
|
switch (sort_method) {
|
|
|
|
case kLevel0:
|
|
|
|
return NewestFirstBySeqNo(f1, f2);
|
|
|
|
case kLevelNon0:
|
|
|
|
return BySmallestKey(f1, f2, internal_comparator);
|
|
|
|
}
|
|
|
|
assert(false);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
struct LevelState {
|
|
|
|
std::unordered_set<uint64_t> deleted_files;
|
|
|
|
// Map from file number to file meta data.
|
|
|
|
std::unordered_map<uint64_t, FileMetaData*> added_files;
|
|
|
|
};
|
|
|
|
|
Introduce a new storage specific Env API (#5761)
Summary:
The current Env API encompasses both storage/file operations, as well as OS related operations. Most of the APIs return a Status, which does not have enough metadata about an error, such as whether its retry-able or not, scope (i.e fault domain) of the error etc., that may be required in order to properly handle a storage error. The file APIs also do not provide enough control over the IO SLA, such as timeout, prioritization, hinting about placement and redundancy etc.
This PR separates out the file/storage APIs from Env into a new FileSystem class. The APIs are updated to return an IOStatus with metadata about the error, as well as to take an IOOptions structure as input in order to allow more control over the IO.
The user can set both ```options.env``` and ```options.file_system``` to specify that RocksDB should use the former for OS related operations and the latter for storage operations. Internally, a ```CompositeEnvWrapper``` has been introduced that inherits from ```Env``` and redirects individual methods to either an ```Env``` implementation or the ```FileSystem``` as appropriate. When options are sanitized during ```DB::Open```, ```options.env``` is replaced with a newly allocated ```CompositeEnvWrapper``` instance if both env and file_system have been specified. This way, the rest of the RocksDB code can continue to function as before.
This PR also ports PosixEnv to the new API by splitting it into two - PosixEnv and PosixFileSystem. PosixEnv is defined as a sub-class of CompositeEnvWrapper, and threading/time functions are overridden with Posix specific implementations in order to avoid an extra level of indirection.
The ```CompositeEnvWrapper``` translates ```IOStatus``` return code to ```Status```, and sets the severity to ```kSoftError``` if the io_status is retryable. The error handling code in RocksDB can then recover the DB automatically.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/5761
Differential Revision: D18868376
Pulled By: anand1976
fbshipit-source-id: 39efe18a162ea746fabac6360ff529baba48486f
5 years ago
|
|
|
const FileOptions& file_options_;
|
|
|
|
const ImmutableCFOptions* const ioptions_;
|
|
|
|
TableCache* table_cache_;
|
|
|
|
VersionStorageInfo* base_vstorage_;
|
|
|
|
VersionSet* version_set_;
|
|
|
|
int num_levels_;
|
|
|
|
LevelState* levels_;
|
|
|
|
// Store states of levels larger than num_levels_. We do this instead of
|
|
|
|
// storing them in levels_ to avoid regression in case there are no files
|
|
|
|
// on invalid levels. The version is not consistent if in the end the files
|
|
|
|
// on invalid levels don't cancel out.
|
|
|
|
std::map<int, std::unordered_set<uint64_t>> invalid_levels_;
|
|
|
|
// Whether there are invalid new files or invalid deletion on levels larger
|
|
|
|
// than num_levels_.
|
|
|
|
bool has_invalid_levels_;
|
|
|
|
FileComparator level_zero_cmp_;
|
|
|
|
FileComparator level_nonzero_cmp_;
|
|
|
|
|
Add blob files to VersionStorageInfo/VersionBuilder (#6597)
Summary:
The patch adds a couple of classes to represent metadata about
blob files: `SharedBlobFileMetaData` contains the information elements
that are immutable (once the blob file is closed), e.g. blob file number,
total number and size of blob files, checksum method/value, while
`BlobFileMetaData` contains attributes that can vary across versions like
the amount of garbage in the file. There is a single `SharedBlobFileMetaData`
for each blob file, which is jointly owned by the `BlobFileMetaData` objects
that point to it; `BlobFileMetaData` objects, in turn, are owned by `Version`s
and can also be shared if the (immutable _and_ mutable) state of the blob file
is the same in two versions.
In addition, the patch adds the blob file metadata to `VersionStorageInfo`, and extends
`VersionBuilder` so that it can apply blob file related `VersionEdit`s (i.e. those
containing `BlobFileAddition`s and/or `BlobFileGarbage`), and save blob file metadata
to a new `VersionStorageInfo`. Consistency checks are also extended to ensure
that table files point to blob files that are part of the `Version`, and that all blob files
that are part of any given `Version` have at least some _non_-garbage data in them.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6597
Test Plan: `make check`
Reviewed By: riversand963
Differential Revision: D20656803
Pulled By: ltamasi
fbshipit-source-id: f1f74d135045b3b42d0146f03ee576ef0a4bfd80
5 years ago
|
|
|
// Metadata for all blob files affected by the series of version edits.
|
|
|
|
std::map<uint64_t, std::shared_ptr<BlobFileMetaData>> changed_blob_files_;
|
|
|
|
|
|
|
|
public:
|
|
|
|
Rep(const FileOptions& file_options, const ImmutableCFOptions* ioptions,
|
|
|
|
TableCache* table_cache, VersionStorageInfo* base_vstorage,
|
|
|
|
VersionSet* version_set)
|
Introduce a new storage specific Env API (#5761)
Summary:
The current Env API encompasses both storage/file operations, as well as OS related operations. Most of the APIs return a Status, which does not have enough metadata about an error, such as whether its retry-able or not, scope (i.e fault domain) of the error etc., that may be required in order to properly handle a storage error. The file APIs also do not provide enough control over the IO SLA, such as timeout, prioritization, hinting about placement and redundancy etc.
This PR separates out the file/storage APIs from Env into a new FileSystem class. The APIs are updated to return an IOStatus with metadata about the error, as well as to take an IOOptions structure as input in order to allow more control over the IO.
The user can set both ```options.env``` and ```options.file_system``` to specify that RocksDB should use the former for OS related operations and the latter for storage operations. Internally, a ```CompositeEnvWrapper``` has been introduced that inherits from ```Env``` and redirects individual methods to either an ```Env``` implementation or the ```FileSystem``` as appropriate. When options are sanitized during ```DB::Open```, ```options.env``` is replaced with a newly allocated ```CompositeEnvWrapper``` instance if both env and file_system have been specified. This way, the rest of the RocksDB code can continue to function as before.
This PR also ports PosixEnv to the new API by splitting it into two - PosixEnv and PosixFileSystem. PosixEnv is defined as a sub-class of CompositeEnvWrapper, and threading/time functions are overridden with Posix specific implementations in order to avoid an extra level of indirection.
The ```CompositeEnvWrapper``` translates ```IOStatus``` return code to ```Status```, and sets the severity to ```kSoftError``` if the io_status is retryable. The error handling code in RocksDB can then recover the DB automatically.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/5761
Differential Revision: D18868376
Pulled By: anand1976
fbshipit-source-id: 39efe18a162ea746fabac6360ff529baba48486f
5 years ago
|
|
|
: file_options_(file_options),
|
|
|
|
ioptions_(ioptions),
|
|
|
|
table_cache_(table_cache),
|
|
|
|
base_vstorage_(base_vstorage),
|
|
|
|
version_set_(version_set),
|
|
|
|
num_levels_(base_vstorage->num_levels()),
|
|
|
|
has_invalid_levels_(false) {
|
|
|
|
assert(ioptions_);
|
|
|
|
|
|
|
|
levels_ = new LevelState[num_levels_];
|
|
|
|
level_zero_cmp_.sort_method = FileComparator::kLevel0;
|
|
|
|
level_nonzero_cmp_.sort_method = FileComparator::kLevelNon0;
|
|
|
|
level_nonzero_cmp_.internal_comparator =
|
|
|
|
base_vstorage_->InternalComparator();
|
|
|
|
}
|
|
|
|
|
|
|
|
~Rep() {
|
|
|
|
for (int level = 0; level < num_levels_; level++) {
|
|
|
|
const auto& added = levels_[level].added_files;
|
|
|
|
for (auto& pair : added) {
|
|
|
|
UnrefFile(pair.second);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
delete[] levels_;
|
|
|
|
}
|
|
|
|
|
|
|
|
void UnrefFile(FileMetaData* f) {
|
|
|
|
f->refs--;
|
|
|
|
if (f->refs <= 0) {
|
|
|
|
if (f->table_reader_handle) {
|
|
|
|
assert(table_cache_ != nullptr);
|
|
|
|
table_cache_->ReleaseHandle(f->table_reader_handle);
|
|
|
|
f->table_reader_handle = nullptr;
|
|
|
|
}
|
|
|
|
delete f;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Add blob files to VersionStorageInfo/VersionBuilder (#6597)
Summary:
The patch adds a couple of classes to represent metadata about
blob files: `SharedBlobFileMetaData` contains the information elements
that are immutable (once the blob file is closed), e.g. blob file number,
total number and size of blob files, checksum method/value, while
`BlobFileMetaData` contains attributes that can vary across versions like
the amount of garbage in the file. There is a single `SharedBlobFileMetaData`
for each blob file, which is jointly owned by the `BlobFileMetaData` objects
that point to it; `BlobFileMetaData` objects, in turn, are owned by `Version`s
and can also be shared if the (immutable _and_ mutable) state of the blob file
is the same in two versions.
In addition, the patch adds the blob file metadata to `VersionStorageInfo`, and extends
`VersionBuilder` so that it can apply blob file related `VersionEdit`s (i.e. those
containing `BlobFileAddition`s and/or `BlobFileGarbage`), and save blob file metadata
to a new `VersionStorageInfo`. Consistency checks are also extended to ensure
that table files point to blob files that are part of the `Version`, and that all blob files
that are part of any given `Version` have at least some _non_-garbage data in them.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6597
Test Plan: `make check`
Reviewed By: riversand963
Differential Revision: D20656803
Pulled By: ltamasi
fbshipit-source-id: f1f74d135045b3b42d0146f03ee576ef0a4bfd80
5 years ago
|
|
|
std::shared_ptr<BlobFileMetaData> GetBlobFileMetaData(
|
|
|
|
uint64_t blob_file_number) const {
|
|
|
|
auto changed_it = changed_blob_files_.find(blob_file_number);
|
|
|
|
if (changed_it != changed_blob_files_.end()) {
|
|
|
|
const auto& meta = changed_it->second;
|
|
|
|
assert(meta);
|
|
|
|
|
|
|
|
return meta;
|
|
|
|
}
|
|
|
|
|
|
|
|
assert(base_vstorage_);
|
|
|
|
|
|
|
|
const auto& base_blob_files = base_vstorage_->GetBlobFiles();
|
|
|
|
|
|
|
|
auto base_it = base_blob_files.find(blob_file_number);
|
|
|
|
if (base_it != base_blob_files.end()) {
|
|
|
|
const auto& meta = base_it->second;
|
|
|
|
assert(meta);
|
|
|
|
|
|
|
|
return meta;
|
|
|
|
}
|
|
|
|
|
|
|
|
return std::shared_ptr<BlobFileMetaData>();
|
|
|
|
}
|
|
|
|
|
|
|
|
Status CheckConsistencyOfOldestBlobFileReference(
|
|
|
|
const VersionStorageInfo* vstorage, uint64_t blob_file_number) const {
|
|
|
|
assert(vstorage);
|
|
|
|
|
|
|
|
// TODO: remove this check once we actually start recoding metadata for
|
|
|
|
// blob files in the MANIFEST.
|
|
|
|
if (vstorage->GetBlobFiles().empty()) {
|
|
|
|
return Status::OK();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (blob_file_number == kInvalidBlobFileNumber) {
|
|
|
|
return Status::OK();
|
|
|
|
}
|
|
|
|
|
|
|
|
const auto meta = GetBlobFileMetaData(blob_file_number);
|
|
|
|
if (!meta) {
|
|
|
|
std::ostringstream oss;
|
|
|
|
oss << "Blob file #" << blob_file_number
|
|
|
|
<< " is not part of this version";
|
|
|
|
|
|
|
|
return Status::Corruption("VersionBuilder", oss.str());
|
|
|
|
}
|
|
|
|
|
|
|
|
return Status::OK();
|
|
|
|
}
|
|
|
|
|
|
|
|
Status CheckConsistency(VersionStorageInfo* vstorage) {
|
|
|
|
#ifdef NDEBUG
|
|
|
|
if (!vstorage->force_consistency_checks()) {
|
|
|
|
// Dont run consistency checks in release mode except if
|
|
|
|
// explicitly asked to
|
|
|
|
return Status::OK();
|
|
|
|
}
|
|
|
|
#endif
|
Add blob files to VersionStorageInfo/VersionBuilder (#6597)
Summary:
The patch adds a couple of classes to represent metadata about
blob files: `SharedBlobFileMetaData` contains the information elements
that are immutable (once the blob file is closed), e.g. blob file number,
total number and size of blob files, checksum method/value, while
`BlobFileMetaData` contains attributes that can vary across versions like
the amount of garbage in the file. There is a single `SharedBlobFileMetaData`
for each blob file, which is jointly owned by the `BlobFileMetaData` objects
that point to it; `BlobFileMetaData` objects, in turn, are owned by `Version`s
and can also be shared if the (immutable _and_ mutable) state of the blob file
is the same in two versions.
In addition, the patch adds the blob file metadata to `VersionStorageInfo`, and extends
`VersionBuilder` so that it can apply blob file related `VersionEdit`s (i.e. those
containing `BlobFileAddition`s and/or `BlobFileGarbage`), and save blob file metadata
to a new `VersionStorageInfo`. Consistency checks are also extended to ensure
that table files point to blob files that are part of the `Version`, and that all blob files
that are part of any given `Version` have at least some _non_-garbage data in them.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6597
Test Plan: `make check`
Reviewed By: riversand963
Differential Revision: D20656803
Pulled By: ltamasi
fbshipit-source-id: f1f74d135045b3b42d0146f03ee576ef0a4bfd80
5 years ago
|
|
|
// Make sure the files are sorted correctly and that the oldest blob file
|
|
|
|
// reference for each table file points to a valid blob file in this
|
|
|
|
// version.
|
|
|
|
for (int level = 0; level < num_levels_; level++) {
|
|
|
|
auto& level_files = vstorage->LevelFiles(level);
|
Add blob files to VersionStorageInfo/VersionBuilder (#6597)
Summary:
The patch adds a couple of classes to represent metadata about
blob files: `SharedBlobFileMetaData` contains the information elements
that are immutable (once the blob file is closed), e.g. blob file number,
total number and size of blob files, checksum method/value, while
`BlobFileMetaData` contains attributes that can vary across versions like
the amount of garbage in the file. There is a single `SharedBlobFileMetaData`
for each blob file, which is jointly owned by the `BlobFileMetaData` objects
that point to it; `BlobFileMetaData` objects, in turn, are owned by `Version`s
and can also be shared if the (immutable _and_ mutable) state of the blob file
is the same in two versions.
In addition, the patch adds the blob file metadata to `VersionStorageInfo`, and extends
`VersionBuilder` so that it can apply blob file related `VersionEdit`s (i.e. those
containing `BlobFileAddition`s and/or `BlobFileGarbage`), and save blob file metadata
to a new `VersionStorageInfo`. Consistency checks are also extended to ensure
that table files point to blob files that are part of the `Version`, and that all blob files
that are part of any given `Version` have at least some _non_-garbage data in them.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6597
Test Plan: `make check`
Reviewed By: riversand963
Differential Revision: D20656803
Pulled By: ltamasi
fbshipit-source-id: f1f74d135045b3b42d0146f03ee576ef0a4bfd80
5 years ago
|
|
|
|
|
|
|
if (level_files.empty()) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
assert(level_files[0]);
|
|
|
|
Status s = CheckConsistencyOfOldestBlobFileReference(
|
|
|
|
vstorage, level_files[0]->oldest_blob_file_number);
|
|
|
|
if (!s.ok()) {
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (size_t i = 1; i < level_files.size(); i++) {
|
Add blob files to VersionStorageInfo/VersionBuilder (#6597)
Summary:
The patch adds a couple of classes to represent metadata about
blob files: `SharedBlobFileMetaData` contains the information elements
that are immutable (once the blob file is closed), e.g. blob file number,
total number and size of blob files, checksum method/value, while
`BlobFileMetaData` contains attributes that can vary across versions like
the amount of garbage in the file. There is a single `SharedBlobFileMetaData`
for each blob file, which is jointly owned by the `BlobFileMetaData` objects
that point to it; `BlobFileMetaData` objects, in turn, are owned by `Version`s
and can also be shared if the (immutable _and_ mutable) state of the blob file
is the same in two versions.
In addition, the patch adds the blob file metadata to `VersionStorageInfo`, and extends
`VersionBuilder` so that it can apply blob file related `VersionEdit`s (i.e. those
containing `BlobFileAddition`s and/or `BlobFileGarbage`), and save blob file metadata
to a new `VersionStorageInfo`. Consistency checks are also extended to ensure
that table files point to blob files that are part of the `Version`, and that all blob files
that are part of any given `Version` have at least some _non_-garbage data in them.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6597
Test Plan: `make check`
Reviewed By: riversand963
Differential Revision: D20656803
Pulled By: ltamasi
fbshipit-source-id: f1f74d135045b3b42d0146f03ee576ef0a4bfd80
5 years ago
|
|
|
assert(level_files[i]);
|
|
|
|
s = CheckConsistencyOfOldestBlobFileReference(
|
|
|
|
vstorage, level_files[i]->oldest_blob_file_number);
|
|
|
|
if (!s.ok()) {
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
auto f1 = level_files[i - 1];
|
|
|
|
auto f2 = level_files[i];
|
|
|
|
#ifndef NDEBUG
|
|
|
|
auto pair = std::make_pair(&f1, &f2);
|
|
|
|
TEST_SYNC_POINT_CALLBACK("VersionBuilder::CheckConsistency", &pair);
|
|
|
|
#endif
|
|
|
|
if (level == 0) {
|
|
|
|
if (!level_zero_cmp_(f1, f2)) {
|
|
|
|
fprintf(stderr, "L0 files are not sorted properly");
|
|
|
|
return Status::Corruption("L0 files are not sorted properly");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (f2->fd.smallest_seqno == f2->fd.largest_seqno) {
|
|
|
|
// This is an external file that we ingested
|
|
|
|
SequenceNumber external_file_seqno = f2->fd.smallest_seqno;
|
|
|
|
if (!(external_file_seqno < f1->fd.largest_seqno ||
|
|
|
|
external_file_seqno == 0)) {
|
|
|
|
fprintf(stderr,
|
|
|
|
"L0 file with seqno %" PRIu64 " %" PRIu64
|
|
|
|
" vs. file with global_seqno %" PRIu64 "\n",
|
|
|
|
f1->fd.smallest_seqno, f1->fd.largest_seqno,
|
|
|
|
external_file_seqno);
|
|
|
|
return Status::Corruption(
|
|
|
|
"L0 file with seqno " +
|
|
|
|
NumberToString(f1->fd.smallest_seqno) + " " +
|
|
|
|
NumberToString(f1->fd.largest_seqno) +
|
|
|
|
" vs. file with global_seqno" +
|
|
|
|
NumberToString(external_file_seqno) + " with fileNumber " +
|
|
|
|
NumberToString(f1->fd.GetNumber()));
|
|
|
|
}
|
|
|
|
} else if (f1->fd.smallest_seqno <= f2->fd.smallest_seqno) {
|
|
|
|
fprintf(stderr,
|
|
|
|
"L0 files seqno %" PRIu64 " %" PRIu64 " vs. %" PRIu64
|
|
|
|
" %" PRIu64 "\n",
|
|
|
|
f1->fd.smallest_seqno, f1->fd.largest_seqno,
|
|
|
|
f2->fd.smallest_seqno, f2->fd.largest_seqno);
|
|
|
|
return Status::Corruption(
|
|
|
|
"L0 files seqno " + NumberToString(f1->fd.smallest_seqno) +
|
|
|
|
" " + NumberToString(f1->fd.largest_seqno) + " " +
|
|
|
|
NumberToString(f1->fd.GetNumber()) + " vs. " +
|
|
|
|
NumberToString(f2->fd.smallest_seqno) + " " +
|
|
|
|
NumberToString(f2->fd.largest_seqno) + " " +
|
|
|
|
NumberToString(f2->fd.GetNumber()));
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (!level_nonzero_cmp_(f1, f2)) {
|
|
|
|
fprintf(stderr, "L%d files are not sorted properly", level);
|
|
|
|
return Status::Corruption("L" + NumberToString(level) +
|
|
|
|
" files are not sorted properly");
|
|
|
|
}
|
|
|
|
|
|
|
|
// Make sure there is no overlap in levels > 0
|
|
|
|
if (vstorage->InternalComparator()->Compare(f1->largest,
|
|
|
|
f2->smallest) >= 0) {
|
|
|
|
fprintf(stderr, "L%d have overlapping ranges %s vs. %s\n", level,
|
|
|
|
(f1->largest).DebugString(true).c_str(),
|
|
|
|
(f2->smallest).DebugString(true).c_str());
|
|
|
|
return Status::Corruption(
|
|
|
|
"L" + NumberToString(level) + " have overlapping ranges " +
|
|
|
|
(f1->largest).DebugString(true) + " vs. " +
|
|
|
|
(f2->smallest).DebugString(true));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
Add blob files to VersionStorageInfo/VersionBuilder (#6597)
Summary:
The patch adds a couple of classes to represent metadata about
blob files: `SharedBlobFileMetaData` contains the information elements
that are immutable (once the blob file is closed), e.g. blob file number,
total number and size of blob files, checksum method/value, while
`BlobFileMetaData` contains attributes that can vary across versions like
the amount of garbage in the file. There is a single `SharedBlobFileMetaData`
for each blob file, which is jointly owned by the `BlobFileMetaData` objects
that point to it; `BlobFileMetaData` objects, in turn, are owned by `Version`s
and can also be shared if the (immutable _and_ mutable) state of the blob file
is the same in two versions.
In addition, the patch adds the blob file metadata to `VersionStorageInfo`, and extends
`VersionBuilder` so that it can apply blob file related `VersionEdit`s (i.e. those
containing `BlobFileAddition`s and/or `BlobFileGarbage`), and save blob file metadata
to a new `VersionStorageInfo`. Consistency checks are also extended to ensure
that table files point to blob files that are part of the `Version`, and that all blob files
that are part of any given `Version` have at least some _non_-garbage data in them.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6597
Test Plan: `make check`
Reviewed By: riversand963
Differential Revision: D20656803
Pulled By: ltamasi
fbshipit-source-id: f1f74d135045b3b42d0146f03ee576ef0a4bfd80
5 years ago
|
|
|
|
|
|
|
// Make sure that all blob files in the version have non-garbage data.
|
|
|
|
const auto& blob_files = vstorage->GetBlobFiles();
|
|
|
|
for (const auto& pair : blob_files) {
|
|
|
|
const auto& blob_file_meta = pair.second;
|
|
|
|
assert(blob_file_meta);
|
|
|
|
|
|
|
|
if (blob_file_meta->GetGarbageBlobCount() >=
|
|
|
|
blob_file_meta->GetTotalBlobCount()) {
|
|
|
|
std::ostringstream oss;
|
|
|
|
oss << "Blob file #" << blob_file_meta->GetBlobFileNumber()
|
|
|
|
<< " consists entirely of garbage";
|
|
|
|
|
|
|
|
return Status::Corruption("VersionBuilder", oss.str());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Status ret_s;
|
|
|
|
TEST_SYNC_POINT_CALLBACK("VersionBuilder::CheckConsistencyBeforeReturn",
|
|
|
|
&ret_s);
|
|
|
|
return ret_s;
|
|
|
|
}
|
|
|
|
|
|
|
|
Status CheckConsistencyForDeletes(VersionEdit* /*edit*/, uint64_t number,
|
|
|
|
int level) {
|
|
|
|
#ifdef NDEBUG
|
|
|
|
if (!base_vstorage_->force_consistency_checks()) {
|
|
|
|
// Dont run consistency checks in release mode except if
|
|
|
|
// explicitly asked to
|
|
|
|
return Status::OK();
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
// a file to be deleted better exist in the previous version
|
|
|
|
bool found = false;
|
|
|
|
for (int l = 0; !found && l < num_levels_; l++) {
|
|
|
|
const std::vector<FileMetaData*>& base_files =
|
|
|
|
base_vstorage_->LevelFiles(l);
|
|
|
|
for (size_t i = 0; i < base_files.size(); i++) {
|
|
|
|
FileMetaData* f = base_files[i];
|
|
|
|
if (f->fd.GetNumber() == number) {
|
|
|
|
found = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// if the file did not exist in the previous version, then it
|
|
|
|
// is possibly moved from lower level to higher level in current
|
|
|
|
// version
|
|
|
|
for (int l = level + 1; !found && l < num_levels_; l++) {
|
|
|
|
auto& level_added = levels_[l].added_files;
|
|
|
|
auto got = level_added.find(number);
|
|
|
|
if (got != level_added.end()) {
|
|
|
|
found = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// maybe this file was added in a previous edit that was Applied
|
|
|
|
if (!found) {
|
|
|
|
auto& level_added = levels_[level].added_files;
|
|
|
|
auto got = level_added.find(number);
|
|
|
|
if (got != level_added.end()) {
|
|
|
|
found = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!found) {
|
|
|
|
fprintf(stderr, "not found %" PRIu64 "\n", number);
|
|
|
|
return Status::Corruption("not found " + NumberToString(number));
|
|
|
|
}
|
|
|
|
return Status::OK();
|
|
|
|
}
|
|
|
|
|
|
|
|
bool CheckConsistencyForNumLevels() {
|
|
|
|
// Make sure there are no files on or beyond num_levels().
|
|
|
|
if (has_invalid_levels_) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
for (auto& level : invalid_levels_) {
|
|
|
|
if (level.second.size() > 0) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
Add blob files to VersionStorageInfo/VersionBuilder (#6597)
Summary:
The patch adds a couple of classes to represent metadata about
blob files: `SharedBlobFileMetaData` contains the information elements
that are immutable (once the blob file is closed), e.g. blob file number,
total number and size of blob files, checksum method/value, while
`BlobFileMetaData` contains attributes that can vary across versions like
the amount of garbage in the file. There is a single `SharedBlobFileMetaData`
for each blob file, which is jointly owned by the `BlobFileMetaData` objects
that point to it; `BlobFileMetaData` objects, in turn, are owned by `Version`s
and can also be shared if the (immutable _and_ mutable) state of the blob file
is the same in two versions.
In addition, the patch adds the blob file metadata to `VersionStorageInfo`, and extends
`VersionBuilder` so that it can apply blob file related `VersionEdit`s (i.e. those
containing `BlobFileAddition`s and/or `BlobFileGarbage`), and save blob file metadata
to a new `VersionStorageInfo`. Consistency checks are also extended to ensure
that table files point to blob files that are part of the `Version`, and that all blob files
that are part of any given `Version` have at least some _non_-garbage data in them.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6597
Test Plan: `make check`
Reviewed By: riversand963
Differential Revision: D20656803
Pulled By: ltamasi
fbshipit-source-id: f1f74d135045b3b42d0146f03ee576ef0a4bfd80
5 years ago
|
|
|
Status ApplyBlobFileAddition(const BlobFileAddition& blob_file_addition) {
|
|
|
|
const uint64_t blob_file_number = blob_file_addition.GetBlobFileNumber();
|
|
|
|
|
|
|
|
auto meta = GetBlobFileMetaData(blob_file_number);
|
|
|
|
if (meta) {
|
|
|
|
std::ostringstream oss;
|
|
|
|
oss << "Blob file #" << blob_file_number << " already added";
|
|
|
|
|
|
|
|
return Status::Corruption("VersionBuilder", oss.str());
|
|
|
|
}
|
|
|
|
|
|
|
|
// Note: we use C++11 for now but in C++14, this could be done in a more
|
|
|
|
// elegant way using generalized lambda capture.
|
|
|
|
VersionSet* const vs = version_set_;
|
|
|
|
const ImmutableCFOptions* const ioptions = ioptions_;
|
|
|
|
|
|
|
|
auto deleter = [vs, ioptions](SharedBlobFileMetaData* shared_meta) {
|
|
|
|
if (vs) {
|
|
|
|
assert(ioptions);
|
|
|
|
assert(!ioptions->cf_paths.empty());
|
|
|
|
assert(shared_meta);
|
|
|
|
|
|
|
|
vs->AddObsoleteBlobFile(shared_meta->GetBlobFileNumber(),
|
|
|
|
ioptions->cf_paths.front().path);
|
|
|
|
}
|
|
|
|
|
|
|
|
delete shared_meta;
|
|
|
|
};
|
|
|
|
|
|
|
|
auto shared_meta = SharedBlobFileMetaData::Create(
|
Add blob files to VersionStorageInfo/VersionBuilder (#6597)
Summary:
The patch adds a couple of classes to represent metadata about
blob files: `SharedBlobFileMetaData` contains the information elements
that are immutable (once the blob file is closed), e.g. blob file number,
total number and size of blob files, checksum method/value, while
`BlobFileMetaData` contains attributes that can vary across versions like
the amount of garbage in the file. There is a single `SharedBlobFileMetaData`
for each blob file, which is jointly owned by the `BlobFileMetaData` objects
that point to it; `BlobFileMetaData` objects, in turn, are owned by `Version`s
and can also be shared if the (immutable _and_ mutable) state of the blob file
is the same in two versions.
In addition, the patch adds the blob file metadata to `VersionStorageInfo`, and extends
`VersionBuilder` so that it can apply blob file related `VersionEdit`s (i.e. those
containing `BlobFileAddition`s and/or `BlobFileGarbage`), and save blob file metadata
to a new `VersionStorageInfo`. Consistency checks are also extended to ensure
that table files point to blob files that are part of the `Version`, and that all blob files
that are part of any given `Version` have at least some _non_-garbage data in them.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6597
Test Plan: `make check`
Reviewed By: riversand963
Differential Revision: D20656803
Pulled By: ltamasi
fbshipit-source-id: f1f74d135045b3b42d0146f03ee576ef0a4bfd80
5 years ago
|
|
|
blob_file_number, blob_file_addition.GetTotalBlobCount(),
|
|
|
|
blob_file_addition.GetTotalBlobBytes(),
|
|
|
|
blob_file_addition.GetChecksumMethod(),
|
|
|
|
blob_file_addition.GetChecksumValue(), deleter);
|
Add blob files to VersionStorageInfo/VersionBuilder (#6597)
Summary:
The patch adds a couple of classes to represent metadata about
blob files: `SharedBlobFileMetaData` contains the information elements
that are immutable (once the blob file is closed), e.g. blob file number,
total number and size of blob files, checksum method/value, while
`BlobFileMetaData` contains attributes that can vary across versions like
the amount of garbage in the file. There is a single `SharedBlobFileMetaData`
for each blob file, which is jointly owned by the `BlobFileMetaData` objects
that point to it; `BlobFileMetaData` objects, in turn, are owned by `Version`s
and can also be shared if the (immutable _and_ mutable) state of the blob file
is the same in two versions.
In addition, the patch adds the blob file metadata to `VersionStorageInfo`, and extends
`VersionBuilder` so that it can apply blob file related `VersionEdit`s (i.e. those
containing `BlobFileAddition`s and/or `BlobFileGarbage`), and save blob file metadata
to a new `VersionStorageInfo`. Consistency checks are also extended to ensure
that table files point to blob files that are part of the `Version`, and that all blob files
that are part of any given `Version` have at least some _non_-garbage data in them.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6597
Test Plan: `make check`
Reviewed By: riversand963
Differential Revision: D20656803
Pulled By: ltamasi
fbshipit-source-id: f1f74d135045b3b42d0146f03ee576ef0a4bfd80
5 years ago
|
|
|
|
|
|
|
constexpr uint64_t garbage_blob_count = 0;
|
|
|
|
constexpr uint64_t garbage_blob_bytes = 0;
|
|
|
|
auto new_meta = BlobFileMetaData::Create(
|
Add blob files to VersionStorageInfo/VersionBuilder (#6597)
Summary:
The patch adds a couple of classes to represent metadata about
blob files: `SharedBlobFileMetaData` contains the information elements
that are immutable (once the blob file is closed), e.g. blob file number,
total number and size of blob files, checksum method/value, while
`BlobFileMetaData` contains attributes that can vary across versions like
the amount of garbage in the file. There is a single `SharedBlobFileMetaData`
for each blob file, which is jointly owned by the `BlobFileMetaData` objects
that point to it; `BlobFileMetaData` objects, in turn, are owned by `Version`s
and can also be shared if the (immutable _and_ mutable) state of the blob file
is the same in two versions.
In addition, the patch adds the blob file metadata to `VersionStorageInfo`, and extends
`VersionBuilder` so that it can apply blob file related `VersionEdit`s (i.e. those
containing `BlobFileAddition`s and/or `BlobFileGarbage`), and save blob file metadata
to a new `VersionStorageInfo`. Consistency checks are also extended to ensure
that table files point to blob files that are part of the `Version`, and that all blob files
that are part of any given `Version` have at least some _non_-garbage data in them.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6597
Test Plan: `make check`
Reviewed By: riversand963
Differential Revision: D20656803
Pulled By: ltamasi
fbshipit-source-id: f1f74d135045b3b42d0146f03ee576ef0a4bfd80
5 years ago
|
|
|
std::move(shared_meta), garbage_blob_count, garbage_blob_bytes);
|
|
|
|
|
|
|
|
changed_blob_files_.emplace(blob_file_number, std::move(new_meta));
|
|
|
|
|
|
|
|
return Status::OK();
|
|
|
|
}
|
|
|
|
|
|
|
|
Status ApplyBlobFileGarbage(const BlobFileGarbage& blob_file_garbage) {
|
|
|
|
const uint64_t blob_file_number = blob_file_garbage.GetBlobFileNumber();
|
|
|
|
|
|
|
|
auto meta = GetBlobFileMetaData(blob_file_number);
|
|
|
|
if (!meta) {
|
|
|
|
std::ostringstream oss;
|
|
|
|
oss << "Blob file #" << blob_file_number << " not found";
|
|
|
|
|
|
|
|
return Status::Corruption("VersionBuilder", oss.str());
|
|
|
|
}
|
|
|
|
|
|
|
|
assert(meta->GetBlobFileNumber() == blob_file_number);
|
|
|
|
|
|
|
|
auto new_meta = BlobFileMetaData::Create(
|
Add blob files to VersionStorageInfo/VersionBuilder (#6597)
Summary:
The patch adds a couple of classes to represent metadata about
blob files: `SharedBlobFileMetaData` contains the information elements
that are immutable (once the blob file is closed), e.g. blob file number,
total number and size of blob files, checksum method/value, while
`BlobFileMetaData` contains attributes that can vary across versions like
the amount of garbage in the file. There is a single `SharedBlobFileMetaData`
for each blob file, which is jointly owned by the `BlobFileMetaData` objects
that point to it; `BlobFileMetaData` objects, in turn, are owned by `Version`s
and can also be shared if the (immutable _and_ mutable) state of the blob file
is the same in two versions.
In addition, the patch adds the blob file metadata to `VersionStorageInfo`, and extends
`VersionBuilder` so that it can apply blob file related `VersionEdit`s (i.e. those
containing `BlobFileAddition`s and/or `BlobFileGarbage`), and save blob file metadata
to a new `VersionStorageInfo`. Consistency checks are also extended to ensure
that table files point to blob files that are part of the `Version`, and that all blob files
that are part of any given `Version` have at least some _non_-garbage data in them.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6597
Test Plan: `make check`
Reviewed By: riversand963
Differential Revision: D20656803
Pulled By: ltamasi
fbshipit-source-id: f1f74d135045b3b42d0146f03ee576ef0a4bfd80
5 years ago
|
|
|
meta->GetSharedMeta(),
|
|
|
|
meta->GetGarbageBlobCount() + blob_file_garbage.GetGarbageBlobCount(),
|
|
|
|
meta->GetGarbageBlobBytes() + blob_file_garbage.GetGarbageBlobBytes());
|
|
|
|
|
|
|
|
changed_blob_files_[blob_file_number] = std::move(new_meta);
|
|
|
|
|
|
|
|
return Status::OK();
|
|
|
|
}
|
|
|
|
|
|
|
|
// Apply all of the edits in *edit to the current state.
|
|
|
|
Status Apply(VersionEdit* edit) {
|
|
|
|
Status s = CheckConsistency(base_vstorage_);
|
|
|
|
if (!s.ok()) {
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Delete files
|
|
|
|
const auto& del = edit->GetDeletedFiles();
|
|
|
|
for (const auto& del_file : del) {
|
|
|
|
const auto level = del_file.first;
|
|
|
|
const auto number = del_file.second;
|
|
|
|
if (level < num_levels_) {
|
|
|
|
levels_[level].deleted_files.insert(number);
|
|
|
|
CheckConsistencyForDeletes(edit, number, level);
|
|
|
|
|
|
|
|
auto exising = levels_[level].added_files.find(number);
|
|
|
|
if (exising != levels_[level].added_files.end()) {
|
|
|
|
UnrefFile(exising->second);
|
|
|
|
levels_[level].added_files.erase(exising);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (invalid_levels_[level].erase(number) == 0) {
|
|
|
|
// Deleting an non-existing file on invalid level.
|
|
|
|
has_invalid_levels_ = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Add new files
|
|
|
|
for (const auto& new_file : edit->GetNewFiles()) {
|
|
|
|
const int level = new_file.first;
|
|
|
|
if (level < num_levels_) {
|
|
|
|
FileMetaData* f = new FileMetaData(new_file.second);
|
|
|
|
f->refs = 1;
|
|
|
|
|
|
|
|
assert(levels_[level].added_files.find(f->fd.GetNumber()) ==
|
|
|
|
levels_[level].added_files.end());
|
|
|
|
levels_[level].deleted_files.erase(f->fd.GetNumber());
|
|
|
|
levels_[level].added_files[f->fd.GetNumber()] = f;
|
|
|
|
} else {
|
|
|
|
uint64_t number = new_file.second.fd.GetNumber();
|
|
|
|
auto& lvls = invalid_levels_[level];
|
|
|
|
if (lvls.count(number) == 0) {
|
|
|
|
lvls.insert(number);
|
|
|
|
} else {
|
|
|
|
// Creating an already existing file on invalid level.
|
|
|
|
has_invalid_levels_ = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
Add blob files to VersionStorageInfo/VersionBuilder (#6597)
Summary:
The patch adds a couple of classes to represent metadata about
blob files: `SharedBlobFileMetaData` contains the information elements
that are immutable (once the blob file is closed), e.g. blob file number,
total number and size of blob files, checksum method/value, while
`BlobFileMetaData` contains attributes that can vary across versions like
the amount of garbage in the file. There is a single `SharedBlobFileMetaData`
for each blob file, which is jointly owned by the `BlobFileMetaData` objects
that point to it; `BlobFileMetaData` objects, in turn, are owned by `Version`s
and can also be shared if the (immutable _and_ mutable) state of the blob file
is the same in two versions.
In addition, the patch adds the blob file metadata to `VersionStorageInfo`, and extends
`VersionBuilder` so that it can apply blob file related `VersionEdit`s (i.e. those
containing `BlobFileAddition`s and/or `BlobFileGarbage`), and save blob file metadata
to a new `VersionStorageInfo`. Consistency checks are also extended to ensure
that table files point to blob files that are part of the `Version`, and that all blob files
that are part of any given `Version` have at least some _non_-garbage data in them.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6597
Test Plan: `make check`
Reviewed By: riversand963
Differential Revision: D20656803
Pulled By: ltamasi
fbshipit-source-id: f1f74d135045b3b42d0146f03ee576ef0a4bfd80
5 years ago
|
|
|
|
|
|
|
// Add new blob files
|
|
|
|
for (const auto& blob_file_addition : edit->GetBlobFileAdditions()) {
|
|
|
|
s = ApplyBlobFileAddition(blob_file_addition);
|
|
|
|
if (!s.ok()) {
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Increase the amount of garbage for blob files affected by GC
|
|
|
|
for (const auto& blob_file_garbage : edit->GetBlobFileGarbages()) {
|
|
|
|
s = ApplyBlobFileGarbage(blob_file_garbage);
|
|
|
|
if (!s.ok()) {
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
Add blob files to VersionStorageInfo/VersionBuilder (#6597)
Summary:
The patch adds a couple of classes to represent metadata about
blob files: `SharedBlobFileMetaData` contains the information elements
that are immutable (once the blob file is closed), e.g. blob file number,
total number and size of blob files, checksum method/value, while
`BlobFileMetaData` contains attributes that can vary across versions like
the amount of garbage in the file. There is a single `SharedBlobFileMetaData`
for each blob file, which is jointly owned by the `BlobFileMetaData` objects
that point to it; `BlobFileMetaData` objects, in turn, are owned by `Version`s
and can also be shared if the (immutable _and_ mutable) state of the blob file
is the same in two versions.
In addition, the patch adds the blob file metadata to `VersionStorageInfo`, and extends
`VersionBuilder` so that it can apply blob file related `VersionEdit`s (i.e. those
containing `BlobFileAddition`s and/or `BlobFileGarbage`), and save blob file metadata
to a new `VersionStorageInfo`. Consistency checks are also extended to ensure
that table files point to blob files that are part of the `Version`, and that all blob files
that are part of any given `Version` have at least some _non_-garbage data in them.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6597
Test Plan: `make check`
Reviewed By: riversand963
Differential Revision: D20656803
Pulled By: ltamasi
fbshipit-source-id: f1f74d135045b3b42d0146f03ee576ef0a4bfd80
5 years ago
|
|
|
void AddBlobFileIfNeeded(
|
|
|
|
VersionStorageInfo* vstorage,
|
|
|
|
const std::shared_ptr<BlobFileMetaData>& meta) const {
|
|
|
|
assert(vstorage);
|
|
|
|
assert(meta);
|
|
|
|
|
|
|
|
if (meta->GetGarbageBlobCount() < meta->GetTotalBlobCount()) {
|
|
|
|
vstorage->AddBlobFile(meta);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Merge the blob file metadata from the base version with the changes (edits)
|
|
|
|
// applied, and save the result into *vstorage.
|
|
|
|
void SaveBlobFilesTo(VersionStorageInfo* vstorage) const {
|
|
|
|
assert(base_vstorage_);
|
|
|
|
assert(vstorage);
|
|
|
|
|
|
|
|
const auto& base_blob_files = base_vstorage_->GetBlobFiles();
|
|
|
|
auto base_it = base_blob_files.begin();
|
|
|
|
const auto base_it_end = base_blob_files.end();
|
|
|
|
|
|
|
|
auto changed_it = changed_blob_files_.begin();
|
|
|
|
const auto changed_it_end = changed_blob_files_.end();
|
|
|
|
|
|
|
|
while (base_it != base_it_end && changed_it != changed_it_end) {
|
|
|
|
const uint64_t base_blob_file_number = base_it->first;
|
|
|
|
const uint64_t changed_blob_file_number = changed_it->first;
|
|
|
|
|
|
|
|
const auto& base_meta = base_it->second;
|
|
|
|
const auto& changed_meta = changed_it->second;
|
|
|
|
|
|
|
|
assert(base_meta);
|
|
|
|
assert(changed_meta);
|
|
|
|
|
|
|
|
if (base_blob_file_number < changed_blob_file_number) {
|
|
|
|
assert(base_meta->GetGarbageBlobCount() <
|
|
|
|
base_meta->GetTotalBlobCount());
|
|
|
|
|
|
|
|
vstorage->AddBlobFile(base_meta);
|
|
|
|
|
|
|
|
++base_it;
|
|
|
|
} else if (changed_blob_file_number < base_blob_file_number) {
|
|
|
|
AddBlobFileIfNeeded(vstorage, changed_meta);
|
|
|
|
|
|
|
|
++changed_it;
|
|
|
|
} else {
|
|
|
|
assert(base_blob_file_number == changed_blob_file_number);
|
|
|
|
assert(base_meta->GetSharedMeta() == changed_meta->GetSharedMeta());
|
|
|
|
assert(base_meta->GetGarbageBlobCount() <=
|
|
|
|
changed_meta->GetGarbageBlobCount());
|
|
|
|
assert(base_meta->GetGarbageBlobBytes() <=
|
|
|
|
changed_meta->GetGarbageBlobBytes());
|
|
|
|
|
|
|
|
AddBlobFileIfNeeded(vstorage, changed_meta);
|
|
|
|
|
|
|
|
++base_it;
|
|
|
|
++changed_it;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
while (base_it != base_it_end) {
|
|
|
|
const auto& base_meta = base_it->second;
|
|
|
|
assert(base_meta);
|
|
|
|
assert(base_meta->GetGarbageBlobCount() < base_meta->GetTotalBlobCount());
|
|
|
|
|
|
|
|
vstorage->AddBlobFile(base_meta);
|
|
|
|
++base_it;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (changed_it != changed_it_end) {
|
|
|
|
const auto& changed_meta = changed_it->second;
|
|
|
|
assert(changed_meta);
|
|
|
|
|
|
|
|
AddBlobFileIfNeeded(vstorage, changed_meta);
|
|
|
|
++changed_it;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Save the current state in *v.
|
|
|
|
Status SaveTo(VersionStorageInfo* vstorage) {
|
|
|
|
Status s = CheckConsistency(base_vstorage_);
|
|
|
|
if (!s.ok()) {
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
s = CheckConsistency(vstorage);
|
|
|
|
if (!s.ok()) {
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (int level = 0; level < num_levels_; level++) {
|
|
|
|
const auto& cmp = (level == 0) ? level_zero_cmp_ : level_nonzero_cmp_;
|
|
|
|
// Merge the set of added files with the set of pre-existing files.
|
|
|
|
// Drop any deleted files. Store the result in *v.
|
|
|
|
const auto& base_files = base_vstorage_->LevelFiles(level);
|
|
|
|
const auto& unordered_added_files = levels_[level].added_files;
|
|
|
|
vstorage->Reserve(level,
|
|
|
|
base_files.size() + unordered_added_files.size());
|
|
|
|
|
|
|
|
// Sort added files for the level.
|
|
|
|
std::vector<FileMetaData*> added_files;
|
|
|
|
added_files.reserve(unordered_added_files.size());
|
|
|
|
for (const auto& pair : unordered_added_files) {
|
|
|
|
added_files.push_back(pair.second);
|
|
|
|
}
|
|
|
|
std::sort(added_files.begin(), added_files.end(), cmp);
|
|
|
|
|
|
|
|
#ifndef NDEBUG
|
|
|
|
FileMetaData* prev_added_file = nullptr;
|
|
|
|
for (const auto& added : added_files) {
|
|
|
|
if (level > 0 && prev_added_file != nullptr) {
|
|
|
|
assert(base_vstorage_->InternalComparator()->Compare(
|
|
|
|
prev_added_file->smallest, added->smallest) <= 0);
|
|
|
|
}
|
|
|
|
prev_added_file = added;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
auto base_iter = base_files.begin();
|
|
|
|
auto base_end = base_files.end();
|
|
|
|
auto added_iter = added_files.begin();
|
|
|
|
auto added_end = added_files.end();
|
|
|
|
while (added_iter != added_end || base_iter != base_end) {
|
|
|
|
if (base_iter == base_end ||
|
|
|
|
(added_iter != added_end && cmp(*added_iter, *base_iter))) {
|
|
|
|
MaybeAddFile(vstorage, level, *added_iter++);
|
|
|
|
} else {
|
|
|
|
MaybeAddFile(vstorage, level, *base_iter++);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Add blob files to VersionStorageInfo/VersionBuilder (#6597)
Summary:
The patch adds a couple of classes to represent metadata about
blob files: `SharedBlobFileMetaData` contains the information elements
that are immutable (once the blob file is closed), e.g. blob file number,
total number and size of blob files, checksum method/value, while
`BlobFileMetaData` contains attributes that can vary across versions like
the amount of garbage in the file. There is a single `SharedBlobFileMetaData`
for each blob file, which is jointly owned by the `BlobFileMetaData` objects
that point to it; `BlobFileMetaData` objects, in turn, are owned by `Version`s
and can also be shared if the (immutable _and_ mutable) state of the blob file
is the same in two versions.
In addition, the patch adds the blob file metadata to `VersionStorageInfo`, and extends
`VersionBuilder` so that it can apply blob file related `VersionEdit`s (i.e. those
containing `BlobFileAddition`s and/or `BlobFileGarbage`), and save blob file metadata
to a new `VersionStorageInfo`. Consistency checks are also extended to ensure
that table files point to blob files that are part of the `Version`, and that all blob files
that are part of any given `Version` have at least some _non_-garbage data in them.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6597
Test Plan: `make check`
Reviewed By: riversand963
Differential Revision: D20656803
Pulled By: ltamasi
fbshipit-source-id: f1f74d135045b3b42d0146f03ee576ef0a4bfd80
5 years ago
|
|
|
SaveBlobFilesTo(vstorage);
|
|
|
|
|
|
|
|
s = CheckConsistency(vstorage);
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
Status LoadTableHandlers(InternalStats* internal_stats, int max_threads,
|
|
|
|
bool prefetch_index_and_filter_in_cache,
|
|
|
|
bool is_initial_load,
|
|
|
|
const SliceTransform* prefix_extractor) {
|
|
|
|
assert(table_cache_ != nullptr);
|
|
|
|
|
|
|
|
size_t table_cache_capacity = table_cache_->get_cache()->GetCapacity();
|
|
|
|
bool always_load = (table_cache_capacity == TableCache::kInfiniteCapacity);
|
|
|
|
size_t max_load = port::kMaxSizet;
|
|
|
|
|
|
|
|
if (!always_load) {
|
|
|
|
// If it is initial loading and not set to always loading all the
|
|
|
|
// files, we only load up to kInitialLoadLimit files, to limit the
|
|
|
|
// time reopening the DB.
|
|
|
|
const size_t kInitialLoadLimit = 16;
|
|
|
|
size_t load_limit;
|
|
|
|
// If the table cache is not 1/4 full, we pin the table handle to
|
|
|
|
// file metadata to avoid the cache read costs when reading the file.
|
|
|
|
// The downside of pinning those files is that LRU won't be followed
|
|
|
|
// for those files. This doesn't matter much because if number of files
|
|
|
|
// of the DB excceeds table cache capacity, eventually no table reader
|
|
|
|
// will be pinned and LRU will be followed.
|
|
|
|
if (is_initial_load) {
|
|
|
|
load_limit = std::min(kInitialLoadLimit, table_cache_capacity / 4);
|
|
|
|
} else {
|
|
|
|
load_limit = table_cache_capacity / 4;
|
|
|
|
}
|
|
|
|
|
|
|
|
size_t table_cache_usage = table_cache_->get_cache()->GetUsage();
|
|
|
|
if (table_cache_usage >= load_limit) {
|
|
|
|
// TODO (yanqin) find a suitable status code.
|
|
|
|
return Status::OK();
|
|
|
|
} else {
|
|
|
|
max_load = load_limit - table_cache_usage;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// <file metadata, level>
|
|
|
|
std::vector<std::pair<FileMetaData*, int>> files_meta;
|
|
|
|
std::vector<Status> statuses;
|
|
|
|
for (int level = 0; level < num_levels_; level++) {
|
|
|
|
for (auto& file_meta_pair : levels_[level].added_files) {
|
|
|
|
auto* file_meta = file_meta_pair.second;
|
|
|
|
// If the file has been opened before, just skip it.
|
|
|
|
if (!file_meta->table_reader_handle) {
|
|
|
|
files_meta.emplace_back(file_meta, level);
|
|
|
|
statuses.emplace_back(Status::OK());
|
|
|
|
}
|
|
|
|
if (files_meta.size() >= max_load) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (files_meta.size() >= max_load) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
std::atomic<size_t> next_file_meta_idx(0);
|
|
|
|
std::function<void()> load_handlers_func([&]() {
|
|
|
|
while (true) {
|
|
|
|
size_t file_idx = next_file_meta_idx.fetch_add(1);
|
|
|
|
if (file_idx >= files_meta.size()) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
auto* file_meta = files_meta[file_idx].first;
|
|
|
|
int level = files_meta[file_idx].second;
|
|
|
|
statuses[file_idx] = table_cache_->FindTable(
|
Introduce a new storage specific Env API (#5761)
Summary:
The current Env API encompasses both storage/file operations, as well as OS related operations. Most of the APIs return a Status, which does not have enough metadata about an error, such as whether its retry-able or not, scope (i.e fault domain) of the error etc., that may be required in order to properly handle a storage error. The file APIs also do not provide enough control over the IO SLA, such as timeout, prioritization, hinting about placement and redundancy etc.
This PR separates out the file/storage APIs from Env into a new FileSystem class. The APIs are updated to return an IOStatus with metadata about the error, as well as to take an IOOptions structure as input in order to allow more control over the IO.
The user can set both ```options.env``` and ```options.file_system``` to specify that RocksDB should use the former for OS related operations and the latter for storage operations. Internally, a ```CompositeEnvWrapper``` has been introduced that inherits from ```Env``` and redirects individual methods to either an ```Env``` implementation or the ```FileSystem``` as appropriate. When options are sanitized during ```DB::Open```, ```options.env``` is replaced with a newly allocated ```CompositeEnvWrapper``` instance if both env and file_system have been specified. This way, the rest of the RocksDB code can continue to function as before.
This PR also ports PosixEnv to the new API by splitting it into two - PosixEnv and PosixFileSystem. PosixEnv is defined as a sub-class of CompositeEnvWrapper, and threading/time functions are overridden with Posix specific implementations in order to avoid an extra level of indirection.
The ```CompositeEnvWrapper``` translates ```IOStatus``` return code to ```Status```, and sets the severity to ```kSoftError``` if the io_status is retryable. The error handling code in RocksDB can then recover the DB automatically.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/5761
Differential Revision: D18868376
Pulled By: anand1976
fbshipit-source-id: 39efe18a162ea746fabac6360ff529baba48486f
5 years ago
|
|
|
file_options_, *(base_vstorage_->InternalComparator()),
|
|
|
|
file_meta->fd, &file_meta->table_reader_handle, prefix_extractor,
|
|
|
|
false /*no_io */, true /* record_read_stats */,
|
|
|
|
internal_stats->GetFileReadHist(level), false, level,
|
|
|
|
prefetch_index_and_filter_in_cache);
|
|
|
|
if (file_meta->table_reader_handle != nullptr) {
|
|
|
|
// Load table_reader
|
|
|
|
file_meta->fd.table_reader = table_cache_->GetTableReaderFromHandle(
|
|
|
|
file_meta->table_reader_handle);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
std::vector<port::Thread> threads;
|
|
|
|
for (int i = 1; i < max_threads; i++) {
|
|
|
|
threads.emplace_back(load_handlers_func);
|
|
|
|
}
|
|
|
|
load_handlers_func();
|
|
|
|
for (auto& t : threads) {
|
|
|
|
t.join();
|
|
|
|
}
|
|
|
|
for (const auto& s : statuses) {
|
|
|
|
if (!s.ok()) {
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return Status::OK();
|
|
|
|
}
|
|
|
|
|
|
|
|
void MaybeAddFile(VersionStorageInfo* vstorage, int level, FileMetaData* f) {
|
|
|
|
if (levels_[level].deleted_files.count(f->fd.GetNumber()) > 0) {
|
|
|
|
// f is to-be-deleted table file
|
|
|
|
vstorage->RemoveCurrentStats(f);
|
|
|
|
} else {
|
|
|
|
assert(ioptions_);
|
|
|
|
vstorage->AddFile(level, f, ioptions_->info_log);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
Introduce a new storage specific Env API (#5761)
Summary:
The current Env API encompasses both storage/file operations, as well as OS related operations. Most of the APIs return a Status, which does not have enough metadata about an error, such as whether its retry-able or not, scope (i.e fault domain) of the error etc., that may be required in order to properly handle a storage error. The file APIs also do not provide enough control over the IO SLA, such as timeout, prioritization, hinting about placement and redundancy etc.
This PR separates out the file/storage APIs from Env into a new FileSystem class. The APIs are updated to return an IOStatus with metadata about the error, as well as to take an IOOptions structure as input in order to allow more control over the IO.
The user can set both ```options.env``` and ```options.file_system``` to specify that RocksDB should use the former for OS related operations and the latter for storage operations. Internally, a ```CompositeEnvWrapper``` has been introduced that inherits from ```Env``` and redirects individual methods to either an ```Env``` implementation or the ```FileSystem``` as appropriate. When options are sanitized during ```DB::Open```, ```options.env``` is replaced with a newly allocated ```CompositeEnvWrapper``` instance if both env and file_system have been specified. This way, the rest of the RocksDB code can continue to function as before.
This PR also ports PosixEnv to the new API by splitting it into two - PosixEnv and PosixFileSystem. PosixEnv is defined as a sub-class of CompositeEnvWrapper, and threading/time functions are overridden with Posix specific implementations in order to avoid an extra level of indirection.
The ```CompositeEnvWrapper``` translates ```IOStatus``` return code to ```Status```, and sets the severity to ```kSoftError``` if the io_status is retryable. The error handling code in RocksDB can then recover the DB automatically.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/5761
Differential Revision: D18868376
Pulled By: anand1976
fbshipit-source-id: 39efe18a162ea746fabac6360ff529baba48486f
5 years ago
|
|
|
VersionBuilder::VersionBuilder(const FileOptions& file_options,
|
|
|
|
const ImmutableCFOptions* ioptions,
|
|
|
|
TableCache* table_cache,
|
|
|
|
VersionStorageInfo* base_vstorage,
|
|
|
|
VersionSet* version_set)
|
|
|
|
: rep_(new Rep(file_options, ioptions, table_cache, base_vstorage,
|
|
|
|
version_set)) {}
|
|
|
|
|
|
|
|
VersionBuilder::~VersionBuilder() = default;
|
|
|
|
|
|
|
|
bool VersionBuilder::CheckConsistencyForNumLevels() {
|
|
|
|
return rep_->CheckConsistencyForNumLevels();
|
|
|
|
}
|
|
|
|
|
|
|
|
Status VersionBuilder::Apply(VersionEdit* edit) { return rep_->Apply(edit); }
|
|
|
|
|
|
|
|
Status VersionBuilder::SaveTo(VersionStorageInfo* vstorage) {
|
|
|
|
return rep_->SaveTo(vstorage);
|
|
|
|
}
|
|
|
|
|
|
|
|
Status VersionBuilder::LoadTableHandlers(
|
|
|
|
InternalStats* internal_stats, int max_threads,
|
|
|
|
bool prefetch_index_and_filter_in_cache, bool is_initial_load,
|
|
|
|
const SliceTransform* prefix_extractor) {
|
|
|
|
return rep_->LoadTableHandlers(internal_stats, max_threads,
|
|
|
|
prefetch_index_and_filter_in_cache,
|
|
|
|
is_initial_load, prefix_extractor);
|
|
|
|
}
|
|
|
|
|
|
|
|
BaseReferencedVersionBuilder::BaseReferencedVersionBuilder(
|
|
|
|
ColumnFamilyData* cfd)
|
|
|
|
: version_builder_(new VersionBuilder(
|
|
|
|
cfd->current()->version_set()->file_options(), cfd->ioptions(),
|
|
|
|
cfd->table_cache(), cfd->current()->storage_info(),
|
|
|
|
cfd->current()->version_set())),
|
|
|
|
version_(cfd->current()) {
|
|
|
|
version_->Ref();
|
|
|
|
}
|
|
|
|
|
|
|
|
BaseReferencedVersionBuilder::BaseReferencedVersionBuilder(
|
|
|
|
ColumnFamilyData* cfd, Version* v)
|
|
|
|
: version_builder_(new VersionBuilder(
|
|
|
|
cfd->current()->version_set()->file_options(), cfd->ioptions(),
|
|
|
|
cfd->table_cache(), v->storage_info(), v->version_set())),
|
|
|
|
version_(v) {
|
|
|
|
assert(version_ != cfd->current());
|
|
|
|
}
|
|
|
|
|
|
|
|
BaseReferencedVersionBuilder::~BaseReferencedVersionBuilder() {
|
|
|
|
version_->Unref();
|
|
|
|
}
|
|
|
|
|
|
|
|
} // namespace ROCKSDB_NAMESPACE
|