2016-02-09 23:12:00 +00:00
|
|
|
// Copyright (c) 2011-present, Facebook, Inc. All rights reserved.
|
2017-07-15 23:03:42 +00:00
|
|
|
// 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).
|
2014-10-31 18:54:05 +00:00
|
|
|
//
|
|
|
|
// 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>
|
2015-08-11 19:19:56 +00:00
|
|
|
#include <atomic>
|
2019-09-20 19:00:55 +00:00
|
|
|
#include <cinttypes>
|
2016-12-16 19:17:26 +00:00
|
|
|
#include <functional>
|
2017-08-24 23:05:16 +00:00
|
|
|
#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
2020-03-27 01:48:55 +00:00
|
|
|
#include <memory>
|
2014-10-31 18:54:05 +00:00
|
|
|
#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
2020-03-27 01:48:55 +00:00
|
|
|
#include <sstream>
|
2015-08-11 19:19:56 +00:00
|
|
|
#include <thread>
|
2014-12-10 04:33:43 +00:00
|
|
|
#include <unordered_map>
|
|
|
|
#include <unordered_set>
|
2015-09-02 17:25:20 +00:00
|
|
|
#include <utility>
|
2014-10-31 18:54:05 +00:00
|
|
|
#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
2020-03-27 01:48:55 +00:00
|
|
|
#include "db/blob/blob_file_meta.h"
|
2014-10-31 18:54:05 +00:00
|
|
|
#include "db/dbformat.h"
|
2015-09-02 17:25:20 +00:00
|
|
|
#include "db/internal_stats.h"
|
2014-10-31 18:54:05 +00:00
|
|
|
#include "db/table_cache.h"
|
|
|
|
#include "db/version_set.h"
|
2017-02-06 22:43:55 +00:00
|
|
|
#include "port/port.h"
|
2014-10-31 18:54:05 +00:00
|
|
|
#include "table/table_reader.h"
|
2019-08-29 21:06:07 +00:00
|
|
|
#include "util/string_util.h"
|
2014-10-31 18:54:05 +00:00
|
|
|
|
2020-02-20 20:07:53 +00:00
|
|
|
namespace ROCKSDB_NAMESPACE {
|
2014-10-31 18:54:05 +00:00
|
|
|
|
|
|
|
bool NewestFirstBySeqNo(FileMetaData* a, FileMetaData* b) {
|
2018-07-27 23:00:26 +00:00
|
|
|
if (a->fd.largest_seqno != b->fd.largest_seqno) {
|
|
|
|
return a->fd.largest_seqno > b->fd.largest_seqno;
|
2014-10-31 18:54:05 +00:00
|
|
|
}
|
2018-07-27 23:00:26 +00:00
|
|
|
if (a->fd.smallest_seqno != b->fd.smallest_seqno) {
|
|
|
|
return a->fd.smallest_seqno > b->fd.smallest_seqno;
|
2016-10-21 00:05:32 +00:00
|
|
|
}
|
2014-10-31 18:54:05 +00:00
|
|
|
// 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 {
|
2014-11-04 01:45:55 +00:00
|
|
|
enum SortMethod { kLevel0 = 0, kLevelNon0 = 1, } sort_method;
|
2014-10-31 18:54:05 +00:00
|
|
|
const InternalKeyComparator* internal_comparator;
|
|
|
|
|
2017-12-07 19:52:12 +00:00
|
|
|
FileComparator() : internal_comparator(nullptr) {}
|
|
|
|
|
2014-10-31 18:54:05 +00:00
|
|
|
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 {
|
2014-12-10 04:33:43 +00:00
|
|
|
std::unordered_set<uint64_t> deleted_files;
|
|
|
|
// Map from file number to file meta data.
|
|
|
|
std::unordered_map<uint64_t, FileMetaData*> added_files;
|
2014-10-31 18:54:05 +00:00
|
|
|
};
|
|
|
|
|
2020-05-19 16:57:49 +00:00
|
|
|
class BlobFileMetaDataDelta {
|
|
|
|
public:
|
|
|
|
bool IsEmpty() const {
|
|
|
|
return !shared_meta_ && !additional_garbage_count_ &&
|
2020-06-12 16:52:14 +00:00
|
|
|
!additional_garbage_bytes_ && newly_linked_ssts_.empty() &&
|
|
|
|
newly_unlinked_ssts_.empty();
|
2020-05-19 16:57:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
std::shared_ptr<SharedBlobFileMetaData> GetSharedMeta() const {
|
|
|
|
return shared_meta_;
|
|
|
|
}
|
|
|
|
|
|
|
|
uint64_t GetAdditionalGarbageCount() const {
|
|
|
|
return additional_garbage_count_;
|
|
|
|
}
|
|
|
|
|
|
|
|
uint64_t GetAdditionalGarbageBytes() const {
|
|
|
|
return additional_garbage_bytes_;
|
|
|
|
}
|
|
|
|
|
2020-06-12 16:52:14 +00:00
|
|
|
const std::unordered_set<uint64_t>& GetNewlyLinkedSsts() const {
|
|
|
|
return newly_linked_ssts_;
|
|
|
|
}
|
|
|
|
|
|
|
|
const std::unordered_set<uint64_t>& GetNewlyUnlinkedSsts() const {
|
|
|
|
return newly_unlinked_ssts_;
|
|
|
|
}
|
|
|
|
|
2020-05-19 16:57:49 +00:00
|
|
|
void SetSharedMeta(std::shared_ptr<SharedBlobFileMetaData> shared_meta) {
|
|
|
|
assert(!shared_meta_);
|
|
|
|
assert(shared_meta);
|
|
|
|
|
|
|
|
shared_meta_ = std::move(shared_meta);
|
|
|
|
}
|
|
|
|
|
|
|
|
void AddGarbage(uint64_t count, uint64_t bytes) {
|
|
|
|
additional_garbage_count_ += count;
|
|
|
|
additional_garbage_bytes_ += bytes;
|
|
|
|
}
|
|
|
|
|
2020-06-12 16:52:14 +00:00
|
|
|
void LinkSst(uint64_t sst_file_number) {
|
|
|
|
assert(newly_linked_ssts_.find(sst_file_number) ==
|
|
|
|
newly_linked_ssts_.end());
|
|
|
|
|
|
|
|
// Reconcile with newly unlinked SSTs on the fly. (Note: an SST can be
|
|
|
|
// linked to and unlinked from the same blob file in the case of a trivial
|
|
|
|
// move.)
|
|
|
|
auto it = newly_unlinked_ssts_.find(sst_file_number);
|
|
|
|
|
|
|
|
if (it != newly_unlinked_ssts_.end()) {
|
|
|
|
newly_unlinked_ssts_.erase(it);
|
|
|
|
} else {
|
|
|
|
newly_linked_ssts_.emplace(sst_file_number);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void UnlinkSst(uint64_t sst_file_number) {
|
|
|
|
assert(newly_unlinked_ssts_.find(sst_file_number) ==
|
|
|
|
newly_unlinked_ssts_.end());
|
|
|
|
|
|
|
|
// Reconcile with newly linked SSTs on the fly. (Note: an SST can be
|
|
|
|
// linked to and unlinked from the same blob file in the case of a trivial
|
|
|
|
// move.)
|
|
|
|
auto it = newly_linked_ssts_.find(sst_file_number);
|
|
|
|
|
|
|
|
if (it != newly_linked_ssts_.end()) {
|
|
|
|
newly_linked_ssts_.erase(it);
|
|
|
|
} else {
|
|
|
|
newly_unlinked_ssts_.emplace(sst_file_number);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-19 16:57:49 +00:00
|
|
|
private:
|
|
|
|
std::shared_ptr<SharedBlobFileMetaData> shared_meta_;
|
|
|
|
uint64_t additional_garbage_count_ = 0;
|
|
|
|
uint64_t additional_garbage_bytes_ = 0;
|
2020-06-12 16:52:14 +00:00
|
|
|
std::unordered_set<uint64_t> newly_linked_ssts_;
|
|
|
|
std::unordered_set<uint64_t> newly_unlinked_ssts_;
|
2020-05-19 16:57:49 +00:00
|
|
|
};
|
|
|
|
|
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
2019-12-13 22:47:08 +00:00
|
|
|
const FileOptions& file_options_;
|
2020-04-30 18:23:32 +00:00
|
|
|
const ImmutableCFOptions* const ioptions_;
|
2014-10-31 18:54:05 +00:00
|
|
|
TableCache* table_cache_;
|
|
|
|
VersionStorageInfo* base_vstorage_;
|
2020-04-30 18:23:32 +00:00
|
|
|
VersionSet* version_set_;
|
2017-08-24 23:05:16 +00:00
|
|
|
int num_levels_;
|
2014-10-31 18:54:05 +00:00
|
|
|
LevelState* levels_;
|
2020-06-03 18:21:16 +00:00
|
|
|
// Store sizes of levels larger than num_levels_. We do this instead of
|
2017-08-24 23:05:16 +00:00
|
|
|
// 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.
|
2020-06-03 18:21:16 +00:00
|
|
|
std::unordered_map<int, size_t> invalid_level_sizes_;
|
2017-08-24 23:05:16 +00:00
|
|
|
// Whether there are invalid new files or invalid deletion on levels larger
|
|
|
|
// than num_levels_.
|
|
|
|
bool has_invalid_levels_;
|
2020-06-03 18:21:16 +00:00
|
|
|
// Current levels of table files affected by additions/deletions.
|
|
|
|
std::unordered_map<uint64_t, int> table_file_levels_;
|
2014-10-31 18:54:05 +00:00
|
|
|
FileComparator level_zero_cmp_;
|
|
|
|
FileComparator level_nonzero_cmp_;
|
|
|
|
|
2020-05-19 16:57:49 +00:00
|
|
|
// Metadata delta for all blob files affected by the series of version edits.
|
|
|
|
std::map<uint64_t, BlobFileMetaDataDelta> blob_file_meta_deltas_;
|
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
2020-03-27 01:48:55 +00:00
|
|
|
|
2014-10-31 18:54:05 +00:00
|
|
|
public:
|
2020-04-30 18:23:32 +00:00
|
|
|
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
2019-12-13 22:47:08 +00:00
|
|
|
: file_options_(file_options),
|
2020-04-30 18:23:32 +00:00
|
|
|
ioptions_(ioptions),
|
2014-10-31 18:54:05 +00:00
|
|
|
table_cache_(table_cache),
|
2017-08-24 23:05:16 +00:00
|
|
|
base_vstorage_(base_vstorage),
|
2020-04-30 18:23:32 +00:00
|
|
|
version_set_(version_set),
|
2017-08-24 23:05:16 +00:00
|
|
|
num_levels_(base_vstorage->num_levels()),
|
|
|
|
has_invalid_levels_(false) {
|
2020-04-30 18:23:32 +00:00
|
|
|
assert(ioptions_);
|
|
|
|
|
2017-08-24 23:05:16 +00:00
|
|
|
levels_ = new LevelState[num_levels_];
|
2014-10-31 18:54:05 +00:00
|
|
|
level_zero_cmp_.sort_method = FileComparator::kLevel0;
|
|
|
|
level_nonzero_cmp_.sort_method = FileComparator::kLevelNon0;
|
|
|
|
level_nonzero_cmp_.internal_comparator =
|
|
|
|
base_vstorage_->InternalComparator();
|
|
|
|
}
|
|
|
|
|
|
|
|
~Rep() {
|
2017-08-24 23:05:16 +00:00
|
|
|
for (int level = 0; level < num_levels_; level++) {
|
2014-12-10 04:33:43 +00:00
|
|
|
const auto& added = levels_[level].added_files;
|
|
|
|
for (auto& pair : added) {
|
2015-01-07 18:29:21 +00:00
|
|
|
UnrefFile(pair.second);
|
2014-10-31 18:54:05 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
delete[] levels_;
|
|
|
|
}
|
|
|
|
|
2015-01-07 18:29:21 +00:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-19 16:57:49 +00:00
|
|
|
bool IsBlobFileInVersion(uint64_t blob_file_number) const {
|
|
|
|
auto delta_it = blob_file_meta_deltas_.find(blob_file_number);
|
|
|
|
if (delta_it != blob_file_meta_deltas_.end()) {
|
|
|
|
if (delta_it->second.GetSharedMeta()) {
|
|
|
|
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
2020-03-27 01:48:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
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()) {
|
2020-05-19 16:57:49 +00:00
|
|
|
assert(base_it->second);
|
|
|
|
assert(base_it->second->GetSharedMeta());
|
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
2020-03-27 01:48:55 +00:00
|
|
|
|
2020-05-19 16:57:49 +00:00
|
|
|
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
2020-03-27 01:48:55 +00:00
|
|
|
}
|
|
|
|
|
2020-05-19 16:57:49 +00:00
|
|
|
return false;
|
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
2020-03-27 01:48:55 +00:00
|
|
|
}
|
|
|
|
|
2020-06-12 16:52:14 +00:00
|
|
|
using ExpectedLinkedSsts =
|
|
|
|
std::unordered_map<uint64_t, BlobFileMetaData::LinkedSsts>;
|
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
2020-03-27 01:48:55 +00:00
|
|
|
|
2020-06-12 16:52:14 +00:00
|
|
|
static void UpdateExpectedLinkedSsts(
|
|
|
|
uint64_t table_file_number, uint64_t blob_file_number,
|
|
|
|
ExpectedLinkedSsts* expected_linked_ssts) {
|
|
|
|
assert(expected_linked_ssts);
|
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
2020-03-27 01:48:55 +00:00
|
|
|
|
|
|
|
if (blob_file_number == kInvalidBlobFileNumber) {
|
2020-06-12 16:52:14 +00:00
|
|
|
return;
|
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
2020-03-27 01:48:55 +00:00
|
|
|
}
|
|
|
|
|
2020-06-12 16:52:14 +00:00
|
|
|
(*expected_linked_ssts)[blob_file_number].emplace(table_file_number);
|
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
2020-03-27 01:48:55 +00:00
|
|
|
}
|
|
|
|
|
2020-09-30 18:56:16 +00:00
|
|
|
Status CheckConsistencyDetails(VersionStorageInfo* vstorage) {
|
2020-06-12 16:52:14 +00:00
|
|
|
// Make sure the files are sorted correctly and that the links between
|
|
|
|
// table files and blob files are consistent. The latter is checked using
|
|
|
|
// the following mapping, which is built using the forward links
|
|
|
|
// (table file -> blob file), and is subsequently compared with the inverse
|
|
|
|
// mapping stored in the BlobFileMetaData objects.
|
|
|
|
ExpectedLinkedSsts expected_linked_ssts;
|
|
|
|
|
2017-08-24 23:05:16 +00:00
|
|
|
for (int level = 0; level < num_levels_; level++) {
|
2014-10-31 18:54:05 +00:00
|
|
|
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
2020-03-27 01:48:55 +00:00
|
|
|
|
|
|
|
if (level_files.empty()) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
assert(level_files[0]);
|
2020-06-12 16:52:14 +00:00
|
|
|
UpdateExpectedLinkedSsts(level_files[0]->fd.GetNumber(),
|
|
|
|
level_files[0]->oldest_blob_file_number,
|
|
|
|
&expected_linked_ssts);
|
2014-10-31 18:54:05 +00:00
|
|
|
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
2020-03-27 01:48:55 +00:00
|
|
|
assert(level_files[i]);
|
2020-06-12 16:52:14 +00:00
|
|
|
UpdateExpectedLinkedSsts(level_files[i]->fd.GetNumber(),
|
|
|
|
level_files[i]->oldest_blob_file_number,
|
|
|
|
&expected_linked_ssts);
|
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
2020-03-27 01:48:55 +00:00
|
|
|
|
2014-10-31 18:54:05 +00:00
|
|
|
auto f1 = level_files[i - 1];
|
|
|
|
auto f2 = level_files[i];
|
2020-05-06 01:29:50 +00:00
|
|
|
if (level == 0) {
|
2019-08-29 21:06:07 +00:00
|
|
|
#ifndef NDEBUG
|
2020-05-06 01:29:50 +00:00
|
|
|
auto pair = std::make_pair(&f1, &f2);
|
|
|
|
TEST_SYNC_POINT_CALLBACK("VersionBuilder::CheckConsistency0", &pair);
|
2019-08-29 21:06:07 +00:00
|
|
|
#endif
|
2016-10-08 00:21:45 +00:00
|
|
|
if (!level_zero_cmp_(f1, f2)) {
|
2019-08-29 21:06:07 +00:00
|
|
|
return Status::Corruption("L0 files are not sorted properly");
|
2016-10-08 00:21:45 +00:00
|
|
|
}
|
|
|
|
|
2018-07-27 23:00:26 +00:00
|
|
|
if (f2->fd.smallest_seqno == f2->fd.largest_seqno) {
|
2016-10-21 00:05:32 +00:00
|
|
|
// This is an external file that we ingested
|
2018-07-27 23:00:26 +00:00
|
|
|
SequenceNumber external_file_seqno = f2->fd.smallest_seqno;
|
|
|
|
if (!(external_file_seqno < f1->fd.largest_seqno ||
|
2016-10-21 00:05:32 +00:00
|
|
|
external_file_seqno == 0)) {
|
2019-09-20 19:00:55 +00:00
|
|
|
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()));
|
2016-10-21 00:05:32 +00:00
|
|
|
}
|
2018-07-27 23:00:26 +00:00
|
|
|
} else if (f1->fd.smallest_seqno <= f2->fd.smallest_seqno) {
|
2019-08-29 21:06:07 +00:00
|
|
|
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()));
|
2016-10-08 00:21:45 +00:00
|
|
|
}
|
2014-10-31 18:54:05 +00:00
|
|
|
} else {
|
2020-05-06 01:29:50 +00:00
|
|
|
#ifndef NDEBUG
|
|
|
|
auto pair = std::make_pair(&f1, &f2);
|
|
|
|
TEST_SYNC_POINT_CALLBACK("VersionBuilder::CheckConsistency1", &pair);
|
|
|
|
#endif
|
2016-10-08 00:21:45 +00:00
|
|
|
if (!level_nonzero_cmp_(f1, f2)) {
|
2020-12-14 22:06:04 +00:00
|
|
|
return Status::Corruption(
|
|
|
|
"L" + NumberToString(level) +
|
|
|
|
" files are not sorted properly: files #" +
|
|
|
|
NumberToString(f1->fd.GetNumber()) + ", #" +
|
|
|
|
NumberToString(f2->fd.GetNumber()));
|
2016-10-08 00:21:45 +00:00
|
|
|
}
|
2014-10-31 18:54:05 +00:00
|
|
|
|
|
|
|
// Make sure there is no overlap in levels > 0
|
|
|
|
if (vstorage->InternalComparator()->Compare(f1->largest,
|
|
|
|
f2->smallest) >= 0) {
|
2019-08-29 21:06:07 +00:00
|
|
|
return Status::Corruption(
|
2020-12-14 22:06:04 +00:00
|
|
|
"L" + NumberToString(level) +
|
|
|
|
" have overlapping ranges: file #" +
|
|
|
|
NumberToString(f1->fd.GetNumber()) +
|
|
|
|
" largest key: " + (f1->largest).DebugString(true) +
|
|
|
|
" vs. file #" + NumberToString(f2->fd.GetNumber()) +
|
|
|
|
" smallest key: " + (f2->smallest).DebugString(true));
|
2014-10-31 18:54:05 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
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
2020-03-27 01:48:55 +00:00
|
|
|
|
|
|
|
// 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) {
|
2020-06-12 16:52:14 +00:00
|
|
|
const uint64_t blob_file_number = pair.first;
|
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
2020-03-27 01:48:55 +00:00
|
|
|
const auto& blob_file_meta = pair.second;
|
|
|
|
assert(blob_file_meta);
|
|
|
|
|
|
|
|
if (blob_file_meta->GetGarbageBlobCount() >=
|
|
|
|
blob_file_meta->GetTotalBlobCount()) {
|
|
|
|
std::ostringstream oss;
|
2020-06-12 16:52:14 +00:00
|
|
|
oss << "Blob file #" << blob_file_number
|
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
2020-03-27 01:48:55 +00:00
|
|
|
<< " consists entirely of garbage";
|
|
|
|
|
|
|
|
return Status::Corruption("VersionBuilder", oss.str());
|
|
|
|
}
|
2020-06-12 16:52:14 +00:00
|
|
|
|
|
|
|
if (blob_file_meta->GetLinkedSsts() !=
|
|
|
|
expected_linked_ssts[blob_file_number]) {
|
|
|
|
std::ostringstream oss;
|
|
|
|
oss << "Links are inconsistent between table files and blob file #"
|
|
|
|
<< blob_file_number;
|
|
|
|
|
|
|
|
return Status::Corruption("VersionBuilder", oss.str());
|
|
|
|
}
|
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
2020-03-27 01:48:55 +00:00
|
|
|
}
|
|
|
|
|
2020-05-04 21:15:55 +00:00
|
|
|
Status ret_s;
|
|
|
|
TEST_SYNC_POINT_CALLBACK("VersionBuilder::CheckConsistencyBeforeReturn",
|
|
|
|
&ret_s);
|
|
|
|
return ret_s;
|
2014-10-31 18:54:05 +00:00
|
|
|
}
|
|
|
|
|
2020-09-30 18:56:16 +00:00
|
|
|
Status CheckConsistency(VersionStorageInfo* vstorage) {
|
|
|
|
// Always run consistency checks in debug build
|
|
|
|
#ifdef NDEBUG
|
|
|
|
if (!vstorage->force_consistency_checks()) {
|
|
|
|
return Status::OK();
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
Status s = CheckConsistencyDetails(vstorage);
|
|
|
|
if (s.IsCorruption() && s.getState()) {
|
|
|
|
// Make it clear the error is due to force_consistency_checks = 1 or
|
|
|
|
// debug build
|
|
|
|
#ifdef NDEBUG
|
|
|
|
auto prefix = "force_consistency_checks";
|
|
|
|
#else
|
|
|
|
auto prefix = "force_consistency_checks(DEBUG)";
|
|
|
|
#endif
|
|
|
|
s = Status::Corruption(prefix, s.getState());
|
|
|
|
} else {
|
|
|
|
// was only expecting corruption with message, or OK
|
|
|
|
assert(s.ok());
|
|
|
|
}
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
2020-06-03 18:21:16 +00:00
|
|
|
bool CheckConsistencyForNumLevels() const {
|
2017-08-24 23:05:16 +00:00
|
|
|
// Make sure there are no files on or beyond num_levels().
|
|
|
|
if (has_invalid_levels_) {
|
|
|
|
return false;
|
|
|
|
}
|
2020-06-03 18:21:16 +00:00
|
|
|
|
|
|
|
for (const auto& pair : invalid_level_sizes_) {
|
|
|
|
const size_t level_size = pair.second;
|
|
|
|
if (level_size != 0) {
|
2017-08-24 23:05:16 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
2020-06-03 18:21:16 +00:00
|
|
|
|
2017-08-24 23:05:16 +00:00
|
|
|
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
2020-03-27 01:48:55 +00:00
|
|
|
Status ApplyBlobFileAddition(const BlobFileAddition& blob_file_addition) {
|
|
|
|
const uint64_t blob_file_number = blob_file_addition.GetBlobFileNumber();
|
|
|
|
|
2020-05-19 16:57:49 +00:00
|
|
|
if (IsBlobFileInVersion(blob_file_number)) {
|
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
2020-03-27 01:48:55 +00:00
|
|
|
std::ostringstream oss;
|
|
|
|
oss << "Blob file #" << blob_file_number << " already added";
|
|
|
|
|
|
|
|
return Status::Corruption("VersionBuilder", oss.str());
|
|
|
|
}
|
|
|
|
|
2020-04-30 18:23:32 +00:00
|
|
|
// 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;
|
|
|
|
};
|
|
|
|
|
2020-04-23 20:41:32 +00:00
|
|
|
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
2020-03-27 01:48:55 +00:00
|
|
|
blob_file_number, blob_file_addition.GetTotalBlobCount(),
|
|
|
|
blob_file_addition.GetTotalBlobBytes(),
|
|
|
|
blob_file_addition.GetChecksumMethod(),
|
2020-04-30 18:23:32 +00:00
|
|
|
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
2020-03-27 01:48:55 +00:00
|
|
|
|
2020-05-19 16:57:49 +00:00
|
|
|
blob_file_meta_deltas_[blob_file_number].SetSharedMeta(
|
|
|
|
std::move(shared_meta));
|
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
2020-03-27 01:48:55 +00:00
|
|
|
|
|
|
|
return Status::OK();
|
|
|
|
}
|
|
|
|
|
|
|
|
Status ApplyBlobFileGarbage(const BlobFileGarbage& blob_file_garbage) {
|
|
|
|
const uint64_t blob_file_number = blob_file_garbage.GetBlobFileNumber();
|
|
|
|
|
2020-05-19 16:57:49 +00:00
|
|
|
if (!IsBlobFileInVersion(blob_file_number)) {
|
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
2020-03-27 01:48:55 +00:00
|
|
|
std::ostringstream oss;
|
|
|
|
oss << "Blob file #" << blob_file_number << " not found";
|
|
|
|
|
|
|
|
return Status::Corruption("VersionBuilder", oss.str());
|
|
|
|
}
|
|
|
|
|
2020-05-19 16:57:49 +00:00
|
|
|
blob_file_meta_deltas_[blob_file_number].AddGarbage(
|
|
|
|
blob_file_garbage.GetGarbageBlobCount(),
|
|
|
|
blob_file_garbage.GetGarbageBlobBytes());
|
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
2020-03-27 01:48:55 +00:00
|
|
|
|
|
|
|
return Status::OK();
|
|
|
|
}
|
|
|
|
|
2020-06-03 18:21:16 +00:00
|
|
|
int GetCurrentLevelForTableFile(uint64_t file_number) const {
|
|
|
|
auto it = table_file_levels_.find(file_number);
|
|
|
|
if (it != table_file_levels_.end()) {
|
|
|
|
return it->second;
|
|
|
|
}
|
|
|
|
|
|
|
|
assert(base_vstorage_);
|
|
|
|
return base_vstorage_->GetFileLocation(file_number).GetLevel();
|
|
|
|
}
|
|
|
|
|
2020-06-12 16:52:14 +00:00
|
|
|
uint64_t GetOldestBlobFileNumberForTableFile(int level,
|
|
|
|
uint64_t file_number) const {
|
|
|
|
assert(level < num_levels_);
|
|
|
|
|
|
|
|
const auto& added_files = levels_[level].added_files;
|
|
|
|
|
|
|
|
auto it = added_files.find(file_number);
|
|
|
|
if (it != added_files.end()) {
|
|
|
|
const FileMetaData* const meta = it->second;
|
|
|
|
assert(meta);
|
|
|
|
|
|
|
|
return meta->oldest_blob_file_number;
|
|
|
|
}
|
|
|
|
|
|
|
|
assert(base_vstorage_);
|
|
|
|
const FileMetaData* const meta =
|
|
|
|
base_vstorage_->GetFileMetaDataByNumber(file_number);
|
|
|
|
assert(meta);
|
|
|
|
|
|
|
|
return meta->oldest_blob_file_number;
|
|
|
|
}
|
|
|
|
|
2021-04-19 18:55:20 +00:00
|
|
|
uint64_t GetMinOldestBlobFileNumber() const {
|
|
|
|
uint64_t min_oldest_blob_file_num = std::numeric_limits<uint64_t>::max();
|
|
|
|
for (int level = 0; level < num_levels_; ++level) {
|
|
|
|
const auto& base_files = base_vstorage_->LevelFiles(level);
|
|
|
|
for (const auto* fmeta : base_files) {
|
|
|
|
assert(fmeta);
|
|
|
|
min_oldest_blob_file_num =
|
|
|
|
std::min(min_oldest_blob_file_num, fmeta->oldest_blob_file_number);
|
|
|
|
}
|
|
|
|
const auto& added_files = levels_[level].added_files;
|
|
|
|
for (const auto& elem : added_files) {
|
|
|
|
assert(elem.second);
|
|
|
|
min_oldest_blob_file_num = std::min(
|
|
|
|
min_oldest_blob_file_num, elem.second->oldest_blob_file_number);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (min_oldest_blob_file_num == std::numeric_limits<uint64_t>::max()) {
|
|
|
|
min_oldest_blob_file_num = kInvalidBlobFileNumber;
|
|
|
|
}
|
|
|
|
return min_oldest_blob_file_num;
|
|
|
|
}
|
|
|
|
|
2020-06-03 18:21:16 +00:00
|
|
|
Status ApplyFileDeletion(int level, uint64_t file_number) {
|
|
|
|
assert(level != VersionStorageInfo::FileLocation::Invalid().GetLevel());
|
|
|
|
|
|
|
|
const int current_level = GetCurrentLevelForTableFile(file_number);
|
|
|
|
|
|
|
|
if (level != current_level) {
|
|
|
|
if (level >= num_levels_) {
|
|
|
|
has_invalid_levels_ = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
std::ostringstream oss;
|
|
|
|
oss << "Cannot delete table file #" << file_number << " from level "
|
|
|
|
<< level << " since it is ";
|
|
|
|
if (current_level ==
|
|
|
|
VersionStorageInfo::FileLocation::Invalid().GetLevel()) {
|
|
|
|
oss << "not in the LSM tree";
|
|
|
|
} else {
|
|
|
|
oss << "on level " << current_level;
|
|
|
|
}
|
|
|
|
|
|
|
|
return Status::Corruption("VersionBuilder", oss.str());
|
|
|
|
}
|
|
|
|
|
|
|
|
if (level >= num_levels_) {
|
|
|
|
assert(invalid_level_sizes_[level] > 0);
|
|
|
|
--invalid_level_sizes_[level];
|
|
|
|
|
|
|
|
table_file_levels_[file_number] =
|
|
|
|
VersionStorageInfo::FileLocation::Invalid().GetLevel();
|
|
|
|
|
|
|
|
return Status::OK();
|
|
|
|
}
|
|
|
|
|
2020-06-12 16:52:14 +00:00
|
|
|
const uint64_t blob_file_number =
|
|
|
|
GetOldestBlobFileNumberForTableFile(level, file_number);
|
|
|
|
|
|
|
|
if (blob_file_number != kInvalidBlobFileNumber &&
|
|
|
|
IsBlobFileInVersion(blob_file_number)) {
|
|
|
|
blob_file_meta_deltas_[blob_file_number].UnlinkSst(file_number);
|
|
|
|
}
|
|
|
|
|
2020-06-03 18:21:16 +00:00
|
|
|
auto& level_state = levels_[level];
|
|
|
|
|
|
|
|
auto& add_files = level_state.added_files;
|
|
|
|
auto add_it = add_files.find(file_number);
|
|
|
|
if (add_it != add_files.end()) {
|
|
|
|
UnrefFile(add_it->second);
|
|
|
|
add_files.erase(add_it);
|
|
|
|
}
|
|
|
|
|
2020-06-12 01:29:51 +00:00
|
|
|
auto& del_files = level_state.deleted_files;
|
|
|
|
assert(del_files.find(file_number) == del_files.end());
|
|
|
|
del_files.emplace(file_number);
|
|
|
|
|
2020-06-03 18:21:16 +00:00
|
|
|
table_file_levels_[file_number] =
|
|
|
|
VersionStorageInfo::FileLocation::Invalid().GetLevel();
|
|
|
|
|
|
|
|
return Status::OK();
|
|
|
|
}
|
|
|
|
|
|
|
|
Status ApplyFileAddition(int level, const FileMetaData& meta) {
|
|
|
|
assert(level != VersionStorageInfo::FileLocation::Invalid().GetLevel());
|
|
|
|
|
|
|
|
const uint64_t file_number = meta.fd.GetNumber();
|
|
|
|
|
|
|
|
const int current_level = GetCurrentLevelForTableFile(file_number);
|
|
|
|
|
|
|
|
if (current_level !=
|
|
|
|
VersionStorageInfo::FileLocation::Invalid().GetLevel()) {
|
|
|
|
if (level >= num_levels_) {
|
|
|
|
has_invalid_levels_ = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
std::ostringstream oss;
|
|
|
|
oss << "Cannot add table file #" << file_number << " to level " << level
|
|
|
|
<< " since it is already in the LSM tree on level " << current_level;
|
|
|
|
return Status::Corruption("VersionBuilder", oss.str());
|
|
|
|
}
|
|
|
|
|
|
|
|
if (level >= num_levels_) {
|
|
|
|
++invalid_level_sizes_[level];
|
|
|
|
table_file_levels_[file_number] = level;
|
|
|
|
|
|
|
|
return Status::OK();
|
|
|
|
}
|
|
|
|
|
|
|
|
auto& level_state = levels_[level];
|
|
|
|
|
|
|
|
auto& del_files = level_state.deleted_files;
|
|
|
|
auto del_it = del_files.find(file_number);
|
|
|
|
if (del_it != del_files.end()) {
|
|
|
|
del_files.erase(del_it);
|
|
|
|
}
|
|
|
|
|
2020-06-12 01:29:51 +00:00
|
|
|
FileMetaData* const f = new FileMetaData(meta);
|
|
|
|
f->refs = 1;
|
|
|
|
|
|
|
|
auto& add_files = level_state.added_files;
|
|
|
|
assert(add_files.find(file_number) == add_files.end());
|
|
|
|
add_files.emplace(file_number, f);
|
|
|
|
|
2020-06-12 16:52:14 +00:00
|
|
|
const uint64_t blob_file_number = f->oldest_blob_file_number;
|
|
|
|
|
|
|
|
if (blob_file_number != kInvalidBlobFileNumber &&
|
|
|
|
IsBlobFileInVersion(blob_file_number)) {
|
|
|
|
blob_file_meta_deltas_[blob_file_number].LinkSst(file_number);
|
|
|
|
}
|
|
|
|
|
2020-06-03 18:21:16 +00:00
|
|
|
table_file_levels_[file_number] = level;
|
|
|
|
|
|
|
|
return Status::OK();
|
|
|
|
}
|
|
|
|
|
2014-10-31 18:54:05 +00:00
|
|
|
// Apply all of the edits in *edit to the current state.
|
2019-08-29 21:06:07 +00:00
|
|
|
Status Apply(VersionEdit* edit) {
|
2020-06-03 18:21:16 +00:00
|
|
|
{
|
|
|
|
const Status s = CheckConsistency(base_vstorage_);
|
|
|
|
if (!s.ok()) {
|
|
|
|
return s;
|
|
|
|
}
|
2019-08-29 21:06:07 +00:00
|
|
|
}
|
2014-10-31 18:54:05 +00:00
|
|
|
|
2020-06-12 16:52:14 +00:00
|
|
|
// Note: we process the blob file related changes first because the
|
|
|
|
// table file addition/deletion logic depends on the blob files
|
|
|
|
// already being there.
|
|
|
|
|
|
|
|
// Add new blob files
|
|
|
|
for (const auto& blob_file_addition : edit->GetBlobFileAdditions()) {
|
|
|
|
const Status 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()) {
|
|
|
|
const Status s = ApplyBlobFileGarbage(blob_file_garbage);
|
|
|
|
if (!s.ok()) {
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Delete table files
|
2020-06-03 18:21:16 +00:00
|
|
|
for (const auto& deleted_file : edit->GetDeletedFiles()) {
|
|
|
|
const int level = deleted_file.first;
|
|
|
|
const uint64_t file_number = deleted_file.second;
|
2017-08-24 23:05:16 +00:00
|
|
|
|
2020-06-03 18:21:16 +00:00
|
|
|
const Status s = ApplyFileDeletion(level, file_number);
|
|
|
|
if (!s.ok()) {
|
|
|
|
return s;
|
2015-01-07 18:29:21 +00:00
|
|
|
}
|
2014-10-31 18:54:05 +00:00
|
|
|
}
|
|
|
|
|
2020-06-12 16:52:14 +00:00
|
|
|
// Add new table files
|
2014-10-31 18:54:05 +00:00
|
|
|
for (const auto& new_file : edit->GetNewFiles()) {
|
|
|
|
const int level = new_file.first;
|
2020-06-03 18:21:16 +00:00
|
|
|
const FileMetaData& meta = new_file.second;
|
|
|
|
|
|
|
|
const Status s = ApplyFileAddition(level, meta);
|
|
|
|
if (!s.ok()) {
|
|
|
|
return s;
|
2017-08-24 23:05:16 +00:00
|
|
|
}
|
2014-10-31 18:54:05 +00:00
|
|
|
}
|
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
2020-03-27 01:48:55 +00:00
|
|
|
|
2020-06-12 16:52:14 +00:00
|
|
|
return Status::OK();
|
|
|
|
}
|
|
|
|
|
|
|
|
static BlobFileMetaData::LinkedSsts ApplyLinkedSstChanges(
|
|
|
|
const BlobFileMetaData::LinkedSsts& base,
|
|
|
|
const std::unordered_set<uint64_t>& newly_linked,
|
|
|
|
const std::unordered_set<uint64_t>& newly_unlinked) {
|
|
|
|
BlobFileMetaData::LinkedSsts result(base);
|
|
|
|
|
|
|
|
for (uint64_t sst_file_number : newly_unlinked) {
|
|
|
|
assert(result.find(sst_file_number) != result.end());
|
|
|
|
|
|
|
|
result.erase(sst_file_number);
|
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
2020-03-27 01:48:55 +00:00
|
|
|
}
|
|
|
|
|
2020-06-12 16:52:14 +00:00
|
|
|
for (uint64_t sst_file_number : newly_linked) {
|
|
|
|
assert(result.find(sst_file_number) == result.end());
|
|
|
|
|
|
|
|
result.emplace(sst_file_number);
|
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
2020-03-27 01:48:55 +00:00
|
|
|
}
|
|
|
|
|
2020-06-12 16:52:14 +00:00
|
|
|
return result;
|
2014-10-31 18:54:05 +00:00
|
|
|
}
|
|
|
|
|
2020-05-19 16:57:49 +00:00
|
|
|
static std::shared_ptr<BlobFileMetaData> CreateMetaDataForNewBlobFile(
|
|
|
|
const BlobFileMetaDataDelta& delta) {
|
|
|
|
auto shared_meta = delta.GetSharedMeta();
|
|
|
|
assert(shared_meta);
|
|
|
|
|
2020-06-12 16:52:14 +00:00
|
|
|
assert(delta.GetNewlyUnlinkedSsts().empty());
|
|
|
|
|
|
|
|
auto meta = BlobFileMetaData::Create(
|
|
|
|
std::move(shared_meta), delta.GetNewlyLinkedSsts(),
|
|
|
|
delta.GetAdditionalGarbageCount(), delta.GetAdditionalGarbageBytes());
|
2020-05-19 16:57:49 +00:00
|
|
|
|
|
|
|
return meta;
|
|
|
|
}
|
|
|
|
|
|
|
|
static std::shared_ptr<BlobFileMetaData>
|
|
|
|
GetOrCreateMetaDataForExistingBlobFile(
|
|
|
|
const std::shared_ptr<BlobFileMetaData>& base_meta,
|
|
|
|
const BlobFileMetaDataDelta& delta) {
|
|
|
|
assert(base_meta);
|
|
|
|
assert(!delta.GetSharedMeta());
|
|
|
|
|
|
|
|
if (delta.IsEmpty()) {
|
|
|
|
return base_meta;
|
|
|
|
}
|
|
|
|
|
|
|
|
auto shared_meta = base_meta->GetSharedMeta();
|
|
|
|
assert(shared_meta);
|
|
|
|
|
2020-06-12 16:52:14 +00:00
|
|
|
auto linked_ssts = ApplyLinkedSstChanges(base_meta->GetLinkedSsts(),
|
|
|
|
delta.GetNewlyLinkedSsts(),
|
|
|
|
delta.GetNewlyUnlinkedSsts());
|
|
|
|
|
2020-05-19 16:57:49 +00:00
|
|
|
auto meta = BlobFileMetaData::Create(
|
2020-06-12 16:52:14 +00:00
|
|
|
std::move(shared_meta), std::move(linked_ssts),
|
2020-05-19 16:57:49 +00:00
|
|
|
base_meta->GetGarbageBlobCount() + delta.GetAdditionalGarbageCount(),
|
|
|
|
base_meta->GetGarbageBlobBytes() + delta.GetAdditionalGarbageBytes());
|
|
|
|
|
|
|
|
return meta;
|
|
|
|
}
|
|
|
|
|
Clean up blob files based on the linked SST set (#7001)
Summary:
The earlier `VersionBuilder` code only cleaned up blob files that were
marked as entirely consisting of garbage using `VersionEdits` with
`BlobFileGarbage`. This covers the cases when table files go through
regular compaction, where we iterate through the KVs and thus have an
opportunity to calculate the amount of garbage (that is, most cases).
However, it does not help when table files are simply dropped (e.g. deletion
compactions or the `DeleteFile` API). To deal with such cases, the patch
adds logic that cleans up all blob files at the head of the list until the first
one with linked SSTs is found. (As an example, let's assume we have blob files
with numbers 1..10, and the first one with any linked SSTs is number 8.
This means that SSTs in the `Version` only rely on blob files with numbers >= 8,
and thus 1..7 are no longer needed.)
The code change itself is pretty small; however, changing the logic like this
necessitated changes to some tests that have been added recently (namely
to the ones that use blob files in isolation, i.e. without any table files referring
to them). Some of these cases were fixed by bypassing `VersionBuilder` altogether
in order to keep the tests simple (which actually makes them more proper unit tests
as well), while the `VersionBuilder` unit tests were fixed by adding dummy table
files to the test cases as needed.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/7001
Test Plan: `make check`
Reviewed By: riversand963
Differential Revision: D22119474
Pulled By: ltamasi
fbshipit-source-id: c6547141355667d4291d9661d6518eb741e7b54a
2020-06-30 22:30:01 +00:00
|
|
|
// Add the blob file specified by meta to *vstorage if it is determined to
|
|
|
|
// contain valid data (blobs). We make this decision based on the amount
|
|
|
|
// of garbage in the file, and whether the file or any lower-numbered blob
|
|
|
|
// files have any linked SSTs. The latter condition is tracked using the
|
|
|
|
// flag *found_first_non_empty.
|
|
|
|
void AddBlobFileIfNeeded(VersionStorageInfo* vstorage,
|
|
|
|
const std::shared_ptr<BlobFileMetaData>& meta,
|
|
|
|
bool* found_first_non_empty) const {
|
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
2020-03-27 01:48:55 +00:00
|
|
|
assert(vstorage);
|
|
|
|
assert(meta);
|
Clean up blob files based on the linked SST set (#7001)
Summary:
The earlier `VersionBuilder` code only cleaned up blob files that were
marked as entirely consisting of garbage using `VersionEdits` with
`BlobFileGarbage`. This covers the cases when table files go through
regular compaction, where we iterate through the KVs and thus have an
opportunity to calculate the amount of garbage (that is, most cases).
However, it does not help when table files are simply dropped (e.g. deletion
compactions or the `DeleteFile` API). To deal with such cases, the patch
adds logic that cleans up all blob files at the head of the list until the first
one with linked SSTs is found. (As an example, let's assume we have blob files
with numbers 1..10, and the first one with any linked SSTs is number 8.
This means that SSTs in the `Version` only rely on blob files with numbers >= 8,
and thus 1..7 are no longer needed.)
The code change itself is pretty small; however, changing the logic like this
necessitated changes to some tests that have been added recently (namely
to the ones that use blob files in isolation, i.e. without any table files referring
to them). Some of these cases were fixed by bypassing `VersionBuilder` altogether
in order to keep the tests simple (which actually makes them more proper unit tests
as well), while the `VersionBuilder` unit tests were fixed by adding dummy table
files to the test cases as needed.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/7001
Test Plan: `make check`
Reviewed By: riversand963
Differential Revision: D22119474
Pulled By: ltamasi
fbshipit-source-id: c6547141355667d4291d9661d6518eb741e7b54a
2020-06-30 22:30:01 +00:00
|
|
|
assert(found_first_non_empty);
|
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
2020-03-27 01:48:55 +00:00
|
|
|
|
Clean up blob files based on the linked SST set (#7001)
Summary:
The earlier `VersionBuilder` code only cleaned up blob files that were
marked as entirely consisting of garbage using `VersionEdits` with
`BlobFileGarbage`. This covers the cases when table files go through
regular compaction, where we iterate through the KVs and thus have an
opportunity to calculate the amount of garbage (that is, most cases).
However, it does not help when table files are simply dropped (e.g. deletion
compactions or the `DeleteFile` API). To deal with such cases, the patch
adds logic that cleans up all blob files at the head of the list until the first
one with linked SSTs is found. (As an example, let's assume we have blob files
with numbers 1..10, and the first one with any linked SSTs is number 8.
This means that SSTs in the `Version` only rely on blob files with numbers >= 8,
and thus 1..7 are no longer needed.)
The code change itself is pretty small; however, changing the logic like this
necessitated changes to some tests that have been added recently (namely
to the ones that use blob files in isolation, i.e. without any table files referring
to them). Some of these cases were fixed by bypassing `VersionBuilder` altogether
in order to keep the tests simple (which actually makes them more proper unit tests
as well), while the `VersionBuilder` unit tests were fixed by adding dummy table
files to the test cases as needed.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/7001
Test Plan: `make check`
Reviewed By: riversand963
Differential Revision: D22119474
Pulled By: ltamasi
fbshipit-source-id: c6547141355667d4291d9661d6518eb741e7b54a
2020-06-30 22:30:01 +00:00
|
|
|
if (!meta->GetLinkedSsts().empty()) {
|
|
|
|
(*found_first_non_empty) = true;
|
|
|
|
} else if (!(*found_first_non_empty) ||
|
|
|
|
meta->GetGarbageBlobCount() >= meta->GetTotalBlobCount()) {
|
|
|
|
return;
|
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
2020-03-27 01:48:55 +00:00
|
|
|
}
|
Clean up blob files based on the linked SST set (#7001)
Summary:
The earlier `VersionBuilder` code only cleaned up blob files that were
marked as entirely consisting of garbage using `VersionEdits` with
`BlobFileGarbage`. This covers the cases when table files go through
regular compaction, where we iterate through the KVs and thus have an
opportunity to calculate the amount of garbage (that is, most cases).
However, it does not help when table files are simply dropped (e.g. deletion
compactions or the `DeleteFile` API). To deal with such cases, the patch
adds logic that cleans up all blob files at the head of the list until the first
one with linked SSTs is found. (As an example, let's assume we have blob files
with numbers 1..10, and the first one with any linked SSTs is number 8.
This means that SSTs in the `Version` only rely on blob files with numbers >= 8,
and thus 1..7 are no longer needed.)
The code change itself is pretty small; however, changing the logic like this
necessitated changes to some tests that have been added recently (namely
to the ones that use blob files in isolation, i.e. without any table files referring
to them). Some of these cases were fixed by bypassing `VersionBuilder` altogether
in order to keep the tests simple (which actually makes them more proper unit tests
as well), while the `VersionBuilder` unit tests were fixed by adding dummy table
files to the test cases as needed.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/7001
Test Plan: `make check`
Reviewed By: riversand963
Differential Revision: D22119474
Pulled By: ltamasi
fbshipit-source-id: c6547141355667d4291d9661d6518eb741e7b54a
2020-06-30 22:30:01 +00:00
|
|
|
|
|
|
|
vstorage->AddBlobFile(meta);
|
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
2020-03-27 01:48:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// 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);
|
|
|
|
|
Clean up blob files based on the linked SST set (#7001)
Summary:
The earlier `VersionBuilder` code only cleaned up blob files that were
marked as entirely consisting of garbage using `VersionEdits` with
`BlobFileGarbage`. This covers the cases when table files go through
regular compaction, where we iterate through the KVs and thus have an
opportunity to calculate the amount of garbage (that is, most cases).
However, it does not help when table files are simply dropped (e.g. deletion
compactions or the `DeleteFile` API). To deal with such cases, the patch
adds logic that cleans up all blob files at the head of the list until the first
one with linked SSTs is found. (As an example, let's assume we have blob files
with numbers 1..10, and the first one with any linked SSTs is number 8.
This means that SSTs in the `Version` only rely on blob files with numbers >= 8,
and thus 1..7 are no longer needed.)
The code change itself is pretty small; however, changing the logic like this
necessitated changes to some tests that have been added recently (namely
to the ones that use blob files in isolation, i.e. without any table files referring
to them). Some of these cases were fixed by bypassing `VersionBuilder` altogether
in order to keep the tests simple (which actually makes them more proper unit tests
as well), while the `VersionBuilder` unit tests were fixed by adding dummy table
files to the test cases as needed.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/7001
Test Plan: `make check`
Reviewed By: riversand963
Differential Revision: D22119474
Pulled By: ltamasi
fbshipit-source-id: c6547141355667d4291d9661d6518eb741e7b54a
2020-06-30 22:30:01 +00:00
|
|
|
bool found_first_non_empty = false;
|
|
|
|
|
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
2020-03-27 01:48:55 +00:00
|
|
|
const auto& base_blob_files = base_vstorage_->GetBlobFiles();
|
|
|
|
auto base_it = base_blob_files.begin();
|
|
|
|
const auto base_it_end = base_blob_files.end();
|
|
|
|
|
2020-05-19 16:57:49 +00:00
|
|
|
auto delta_it = blob_file_meta_deltas_.begin();
|
|
|
|
const auto delta_it_end = blob_file_meta_deltas_.end();
|
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
2020-03-27 01:48:55 +00:00
|
|
|
|
2020-05-19 16:57:49 +00:00
|
|
|
while (base_it != base_it_end && delta_it != delta_it_end) {
|
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
2020-03-27 01:48:55 +00:00
|
|
|
const uint64_t base_blob_file_number = base_it->first;
|
2020-05-19 16:57:49 +00:00
|
|
|
const uint64_t delta_blob_file_number = delta_it->first;
|
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
2020-03-27 01:48:55 +00:00
|
|
|
|
2020-05-19 16:57:49 +00:00
|
|
|
if (base_blob_file_number < delta_blob_file_number) {
|
|
|
|
const auto& base_meta = base_it->second;
|
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
2020-03-27 01:48:55 +00:00
|
|
|
|
Clean up blob files based on the linked SST set (#7001)
Summary:
The earlier `VersionBuilder` code only cleaned up blob files that were
marked as entirely consisting of garbage using `VersionEdits` with
`BlobFileGarbage`. This covers the cases when table files go through
regular compaction, where we iterate through the KVs and thus have an
opportunity to calculate the amount of garbage (that is, most cases).
However, it does not help when table files are simply dropped (e.g. deletion
compactions or the `DeleteFile` API). To deal with such cases, the patch
adds logic that cleans up all blob files at the head of the list until the first
one with linked SSTs is found. (As an example, let's assume we have blob files
with numbers 1..10, and the first one with any linked SSTs is number 8.
This means that SSTs in the `Version` only rely on blob files with numbers >= 8,
and thus 1..7 are no longer needed.)
The code change itself is pretty small; however, changing the logic like this
necessitated changes to some tests that have been added recently (namely
to the ones that use blob files in isolation, i.e. without any table files referring
to them). Some of these cases were fixed by bypassing `VersionBuilder` altogether
in order to keep the tests simple (which actually makes them more proper unit tests
as well), while the `VersionBuilder` unit tests were fixed by adding dummy table
files to the test cases as needed.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/7001
Test Plan: `make check`
Reviewed By: riversand963
Differential Revision: D22119474
Pulled By: ltamasi
fbshipit-source-id: c6547141355667d4291d9661d6518eb741e7b54a
2020-06-30 22:30:01 +00:00
|
|
|
AddBlobFileIfNeeded(vstorage, base_meta, &found_first_non_empty);
|
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
2020-03-27 01:48:55 +00:00
|
|
|
|
|
|
|
++base_it;
|
2020-05-19 16:57:49 +00:00
|
|
|
} else if (delta_blob_file_number < base_blob_file_number) {
|
2020-09-09 17:23:52 +00:00
|
|
|
const auto& delta = delta_it->second;
|
|
|
|
|
|
|
|
auto meta = CreateMetaDataForNewBlobFile(delta);
|
|
|
|
|
|
|
|
AddBlobFileIfNeeded(vstorage, meta, &found_first_non_empty);
|
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
2020-03-27 01:48:55 +00:00
|
|
|
|
2020-05-19 16:57:49 +00:00
|
|
|
++delta_it;
|
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
2020-03-27 01:48:55 +00:00
|
|
|
} else {
|
2020-05-19 16:57:49 +00:00
|
|
|
assert(base_blob_file_number == delta_blob_file_number);
|
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
2020-03-27 01:48:55 +00:00
|
|
|
|
2020-05-19 16:57:49 +00:00
|
|
|
const auto& base_meta = base_it->second;
|
|
|
|
const auto& delta = delta_it->second;
|
|
|
|
|
|
|
|
auto meta = GetOrCreateMetaDataForExistingBlobFile(base_meta, delta);
|
|
|
|
|
Clean up blob files based on the linked SST set (#7001)
Summary:
The earlier `VersionBuilder` code only cleaned up blob files that were
marked as entirely consisting of garbage using `VersionEdits` with
`BlobFileGarbage`. This covers the cases when table files go through
regular compaction, where we iterate through the KVs and thus have an
opportunity to calculate the amount of garbage (that is, most cases).
However, it does not help when table files are simply dropped (e.g. deletion
compactions or the `DeleteFile` API). To deal with such cases, the patch
adds logic that cleans up all blob files at the head of the list until the first
one with linked SSTs is found. (As an example, let's assume we have blob files
with numbers 1..10, and the first one with any linked SSTs is number 8.
This means that SSTs in the `Version` only rely on blob files with numbers >= 8,
and thus 1..7 are no longer needed.)
The code change itself is pretty small; however, changing the logic like this
necessitated changes to some tests that have been added recently (namely
to the ones that use blob files in isolation, i.e. without any table files referring
to them). Some of these cases were fixed by bypassing `VersionBuilder` altogether
in order to keep the tests simple (which actually makes them more proper unit tests
as well), while the `VersionBuilder` unit tests were fixed by adding dummy table
files to the test cases as needed.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/7001
Test Plan: `make check`
Reviewed By: riversand963
Differential Revision: D22119474
Pulled By: ltamasi
fbshipit-source-id: c6547141355667d4291d9661d6518eb741e7b54a
2020-06-30 22:30:01 +00:00
|
|
|
AddBlobFileIfNeeded(vstorage, meta, &found_first_non_empty);
|
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
2020-03-27 01:48:55 +00:00
|
|
|
|
|
|
|
++base_it;
|
2020-05-19 16:57:49 +00:00
|
|
|
++delta_it;
|
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
2020-03-27 01:48:55 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
while (base_it != base_it_end) {
|
|
|
|
const auto& base_meta = base_it->second;
|
|
|
|
|
Clean up blob files based on the linked SST set (#7001)
Summary:
The earlier `VersionBuilder` code only cleaned up blob files that were
marked as entirely consisting of garbage using `VersionEdits` with
`BlobFileGarbage`. This covers the cases when table files go through
regular compaction, where we iterate through the KVs and thus have an
opportunity to calculate the amount of garbage (that is, most cases).
However, it does not help when table files are simply dropped (e.g. deletion
compactions or the `DeleteFile` API). To deal with such cases, the patch
adds logic that cleans up all blob files at the head of the list until the first
one with linked SSTs is found. (As an example, let's assume we have blob files
with numbers 1..10, and the first one with any linked SSTs is number 8.
This means that SSTs in the `Version` only rely on blob files with numbers >= 8,
and thus 1..7 are no longer needed.)
The code change itself is pretty small; however, changing the logic like this
necessitated changes to some tests that have been added recently (namely
to the ones that use blob files in isolation, i.e. without any table files referring
to them). Some of these cases were fixed by bypassing `VersionBuilder` altogether
in order to keep the tests simple (which actually makes them more proper unit tests
as well), while the `VersionBuilder` unit tests were fixed by adding dummy table
files to the test cases as needed.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/7001
Test Plan: `make check`
Reviewed By: riversand963
Differential Revision: D22119474
Pulled By: ltamasi
fbshipit-source-id: c6547141355667d4291d9661d6518eb741e7b54a
2020-06-30 22:30:01 +00:00
|
|
|
AddBlobFileIfNeeded(vstorage, base_meta, &found_first_non_empty);
|
|
|
|
|
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
2020-03-27 01:48:55 +00:00
|
|
|
++base_it;
|
|
|
|
}
|
|
|
|
|
2020-05-19 16:57:49 +00:00
|
|
|
while (delta_it != delta_it_end) {
|
|
|
|
const auto& delta = delta_it->second;
|
|
|
|
|
|
|
|
auto meta = CreateMetaDataForNewBlobFile(delta);
|
|
|
|
|
Clean up blob files based on the linked SST set (#7001)
Summary:
The earlier `VersionBuilder` code only cleaned up blob files that were
marked as entirely consisting of garbage using `VersionEdits` with
`BlobFileGarbage`. This covers the cases when table files go through
regular compaction, where we iterate through the KVs and thus have an
opportunity to calculate the amount of garbage (that is, most cases).
However, it does not help when table files are simply dropped (e.g. deletion
compactions or the `DeleteFile` API). To deal with such cases, the patch
adds logic that cleans up all blob files at the head of the list until the first
one with linked SSTs is found. (As an example, let's assume we have blob files
with numbers 1..10, and the first one with any linked SSTs is number 8.
This means that SSTs in the `Version` only rely on blob files with numbers >= 8,
and thus 1..7 are no longer needed.)
The code change itself is pretty small; however, changing the logic like this
necessitated changes to some tests that have been added recently (namely
to the ones that use blob files in isolation, i.e. without any table files referring
to them). Some of these cases were fixed by bypassing `VersionBuilder` altogether
in order to keep the tests simple (which actually makes them more proper unit tests
as well), while the `VersionBuilder` unit tests were fixed by adding dummy table
files to the test cases as needed.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/7001
Test Plan: `make check`
Reviewed By: riversand963
Differential Revision: D22119474
Pulled By: ltamasi
fbshipit-source-id: c6547141355667d4291d9661d6518eb741e7b54a
2020-06-30 22:30:01 +00:00
|
|
|
AddBlobFileIfNeeded(vstorage, meta, &found_first_non_empty);
|
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
2020-03-27 01:48:55 +00:00
|
|
|
|
2020-05-19 16:57:49 +00:00
|
|
|
++delta_it;
|
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
2020-03-27 01:48:55 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-04-19 18:55:20 +00:00
|
|
|
// Save the current state in *vstorage.
|
2019-08-29 21:06:07 +00:00
|
|
|
Status SaveTo(VersionStorageInfo* vstorage) {
|
|
|
|
Status s = CheckConsistency(base_vstorage_);
|
|
|
|
if (!s.ok()) {
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
s = CheckConsistency(vstorage);
|
|
|
|
if (!s.ok()) {
|
|
|
|
return s;
|
|
|
|
}
|
2014-10-31 18:54:05 +00:00
|
|
|
|
2017-08-24 23:05:16 +00:00
|
|
|
for (int level = 0; level < num_levels_; level++) {
|
2014-10-31 18:54:05 +00:00
|
|
|
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);
|
2014-12-10 04:33:43 +00:00
|
|
|
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.
|
2014-12-11 23:46:01 +00:00
|
|
|
std::vector<FileMetaData*> added_files;
|
|
|
|
added_files.reserve(unordered_added_files.size());
|
2014-12-10 04:33:43 +00:00
|
|
|
for (const auto& pair : unordered_added_files) {
|
|
|
|
added_files.push_back(pair.second);
|
|
|
|
}
|
|
|
|
std::sort(added_files.begin(), added_files.end(), cmp);
|
2014-10-31 18:54:05 +00:00
|
|
|
|
2014-12-11 23:46:01 +00:00
|
|
|
#ifndef NDEBUG
|
2018-09-15 02:40:37 +00:00
|
|
|
FileMetaData* prev_added_file = nullptr;
|
2014-10-31 18:54:05 +00:00
|
|
|
for (const auto& added : added_files) {
|
2018-09-15 02:40:37 +00:00
|
|
|
if (level > 0 && prev_added_file != nullptr) {
|
2014-12-11 23:46:01 +00:00
|
|
|
assert(base_vstorage_->InternalComparator()->Compare(
|
2018-09-15 02:40:37 +00:00
|
|
|
prev_added_file->smallest, added->smallest) <= 0);
|
2014-12-11 23:46:01 +00:00
|
|
|
}
|
2018-09-15 02:40:37 +00:00
|
|
|
prev_added_file = added;
|
|
|
|
}
|
2014-12-11 23:46:01 +00:00
|
|
|
#endif
|
|
|
|
|
2018-09-15 02:40:37 +00:00
|
|
|
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++);
|
2014-10-31 18:54:05 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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
2020-03-27 01:48:55 +00:00
|
|
|
SaveBlobFilesTo(vstorage);
|
|
|
|
|
2019-08-29 21:06:07 +00:00
|
|
|
s = CheckConsistency(vstorage);
|
|
|
|
return s;
|
2014-10-31 18:54:05 +00:00
|
|
|
}
|
|
|
|
|
2019-03-26 23:41:31 +00:00
|
|
|
Status LoadTableHandlers(InternalStats* internal_stats, int max_threads,
|
|
|
|
bool prefetch_index_and_filter_in_cache,
|
|
|
|
bool is_initial_load,
|
2020-06-09 23:49:07 +00:00
|
|
|
const SliceTransform* prefix_extractor,
|
|
|
|
size_t max_file_size_for_l0_meta_pin) {
|
2014-10-31 18:54:05 +00:00
|
|
|
assert(table_cache_ != nullptr);
|
2018-12-29 02:00:00 +00:00
|
|
|
|
|
|
|
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) {
|
2020-03-12 01:36:43 +00:00
|
|
|
// If it is initial loading and not set to always loading all the
|
2018-12-29 02:00:00 +00:00
|
|
|
// 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) {
|
2019-03-26 23:41:31 +00:00
|
|
|
// TODO (yanqin) find a suitable status code.
|
|
|
|
return Status::OK();
|
2018-12-29 02:00:00 +00:00
|
|
|
} else {
|
|
|
|
max_load = load_limit - table_cache_usage;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-09-02 17:25:20 +00:00
|
|
|
// <file metadata, level>
|
|
|
|
std::vector<std::pair<FileMetaData*, int>> files_meta;
|
2019-03-26 23:41:31 +00:00
|
|
|
std::vector<Status> statuses;
|
2017-08-24 23:05:16 +00:00
|
|
|
for (int level = 0; level < num_levels_; level++) {
|
2014-12-10 04:33:43 +00:00
|
|
|
for (auto& file_meta_pair : levels_[level].added_files) {
|
|
|
|
auto* file_meta = file_meta_pair.second;
|
2019-03-26 23:41:31 +00:00
|
|
|
// 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());
|
|
|
|
}
|
2018-12-29 02:00:00 +00:00
|
|
|
if (files_meta.size() >= max_load) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (files_meta.size() >= max_load) {
|
|
|
|
break;
|
2015-08-11 19:19:56 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
std::atomic<size_t> next_file_meta_idx(0);
|
2018-08-21 00:31:28 +00:00
|
|
|
std::function<void()> load_handlers_func([&]() {
|
2015-08-11 19:19:56 +00:00
|
|
|
while (true) {
|
|
|
|
size_t file_idx = next_file_meta_idx.fetch_add(1);
|
|
|
|
if (file_idx >= files_meta.size()) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2015-09-02 17:25:20 +00:00
|
|
|
auto* file_meta = files_meta[file_idx].first;
|
|
|
|
int level = files_meta[file_idx].second;
|
2019-03-26 23:41:31 +00:00
|
|
|
statuses[file_idx] = table_cache_->FindTable(
|
2020-06-29 21:51:57 +00:00
|
|
|
ReadOptions(), file_options_,
|
|
|
|
*(base_vstorage_->InternalComparator()), file_meta->fd,
|
|
|
|
&file_meta->table_reader_handle, prefix_extractor, false /*no_io */,
|
|
|
|
true /* record_read_stats */,
|
2018-05-21 21:33:55 +00:00
|
|
|
internal_stats->GetFileReadHist(level), false, level,
|
2020-06-09 23:49:07 +00:00
|
|
|
prefetch_index_and_filter_in_cache, max_file_size_for_l0_meta_pin);
|
2014-10-31 18:54:05 +00:00
|
|
|
if (file_meta->table_reader_handle != nullptr) {
|
|
|
|
// Load table_reader
|
|
|
|
file_meta->fd.table_reader = table_cache_->GetTableReaderFromHandle(
|
|
|
|
file_meta->table_reader_handle);
|
2014-11-04 01:45:55 +00:00
|
|
|
}
|
2014-10-31 18:54:05 +00:00
|
|
|
}
|
2018-08-21 00:31:28 +00:00
|
|
|
});
|
2015-08-11 19:19:56 +00:00
|
|
|
|
2018-06-15 19:28:06 +00:00
|
|
|
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();
|
2014-10-31 18:54:05 +00:00
|
|
|
}
|
2020-10-03 05:09:28 +00:00
|
|
|
Status ret;
|
2019-03-26 23:41:31 +00:00
|
|
|
for (const auto& s : statuses) {
|
|
|
|
if (!s.ok()) {
|
2020-10-03 05:09:28 +00:00
|
|
|
if (ret.ok()) {
|
|
|
|
ret = s;
|
|
|
|
}
|
2019-03-26 23:41:31 +00:00
|
|
|
}
|
|
|
|
}
|
2020-10-03 05:09:28 +00:00
|
|
|
return ret;
|
2014-10-31 18:54:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void MaybeAddFile(VersionStorageInfo* vstorage, int level, FileMetaData* f) {
|
2020-06-12 01:29:51 +00:00
|
|
|
const uint64_t file_number = f->fd.GetNumber();
|
|
|
|
|
|
|
|
const auto& level_state = levels_[level];
|
|
|
|
|
|
|
|
const auto& del_files = level_state.deleted_files;
|
|
|
|
const auto del_it = del_files.find(file_number);
|
|
|
|
|
|
|
|
if (del_it != del_files.end()) {
|
2018-03-08 18:18:34 +00:00
|
|
|
// f is to-be-deleted table file
|
2015-12-07 18:51:08 +00:00
|
|
|
vstorage->RemoveCurrentStats(f);
|
2014-10-31 18:54:05 +00:00
|
|
|
} else {
|
2020-06-12 01:29:51 +00:00
|
|
|
const auto& add_files = level_state.added_files;
|
|
|
|
const auto add_it = add_files.find(file_number);
|
|
|
|
|
|
|
|
// Note: if the file appears both in the base version and in the added
|
|
|
|
// list, the added FileMetaData supersedes the one in the base version.
|
|
|
|
if (add_it != add_files.end() && add_it->second != f) {
|
|
|
|
vstorage->RemoveCurrentStats(f);
|
|
|
|
} else {
|
2020-08-11 16:22:00 +00:00
|
|
|
vstorage->AddFile(level, f);
|
2020-06-12 01:29:51 +00:00
|
|
|
}
|
2014-10-31 18:54:05 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
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
2019-12-13 22:47:08 +00:00
|
|
|
VersionBuilder::VersionBuilder(const FileOptions& file_options,
|
2020-04-30 18:23:32 +00:00
|
|
|
const ImmutableCFOptions* ioptions,
|
2014-10-31 18:54:05 +00:00
|
|
|
TableCache* table_cache,
|
2015-10-19 20:07:05 +00:00
|
|
|
VersionStorageInfo* base_vstorage,
|
2020-04-30 18:23:32 +00:00
|
|
|
VersionSet* version_set)
|
|
|
|
: rep_(new Rep(file_options, ioptions, table_cache, base_vstorage,
|
|
|
|
version_set)) {}
|
2017-08-24 23:05:16 +00:00
|
|
|
|
2020-03-19 17:40:31 +00:00
|
|
|
VersionBuilder::~VersionBuilder() = default;
|
2017-08-24 23:05:16 +00:00
|
|
|
|
|
|
|
bool VersionBuilder::CheckConsistencyForNumLevels() {
|
|
|
|
return rep_->CheckConsistencyForNumLevels();
|
|
|
|
}
|
|
|
|
|
2019-08-29 21:06:07 +00:00
|
|
|
Status VersionBuilder::Apply(VersionEdit* edit) { return rep_->Apply(edit); }
|
2017-08-24 23:05:16 +00:00
|
|
|
|
2019-08-29 21:06:07 +00:00
|
|
|
Status VersionBuilder::SaveTo(VersionStorageInfo* vstorage) {
|
|
|
|
return rep_->SaveTo(vstorage);
|
2014-10-31 18:54:05 +00:00
|
|
|
}
|
2017-08-24 23:05:16 +00:00
|
|
|
|
2019-03-26 23:41:31 +00:00
|
|
|
Status VersionBuilder::LoadTableHandlers(
|
|
|
|
InternalStats* internal_stats, int max_threads,
|
|
|
|
bool prefetch_index_and_filter_in_cache, bool is_initial_load,
|
2020-06-09 23:49:07 +00:00
|
|
|
const SliceTransform* prefix_extractor,
|
|
|
|
size_t max_file_size_for_l0_meta_pin) {
|
|
|
|
return rep_->LoadTableHandlers(
|
|
|
|
internal_stats, max_threads, prefetch_index_and_filter_in_cache,
|
|
|
|
is_initial_load, prefix_extractor, max_file_size_for_l0_meta_pin);
|
2015-08-11 19:19:56 +00:00
|
|
|
}
|
2017-08-24 23:05:16 +00:00
|
|
|
|
2021-04-19 18:55:20 +00:00
|
|
|
uint64_t VersionBuilder::GetMinOldestBlobFileNumber() const {
|
|
|
|
return rep_->GetMinOldestBlobFileNumber();
|
|
|
|
}
|
|
|
|
|
2020-03-21 02:17:54 +00:00
|
|
|
BaseReferencedVersionBuilder::BaseReferencedVersionBuilder(
|
|
|
|
ColumnFamilyData* cfd)
|
|
|
|
: version_builder_(new VersionBuilder(
|
2020-04-30 18:23:32 +00:00
|
|
|
cfd->current()->version_set()->file_options(), cfd->ioptions(),
|
|
|
|
cfd->table_cache(), cfd->current()->storage_info(),
|
|
|
|
cfd->current()->version_set())),
|
2020-03-21 02:17:54 +00:00
|
|
|
version_(cfd->current()) {
|
|
|
|
version_->Ref();
|
|
|
|
}
|
|
|
|
|
|
|
|
BaseReferencedVersionBuilder::BaseReferencedVersionBuilder(
|
|
|
|
ColumnFamilyData* cfd, Version* v)
|
|
|
|
: version_builder_(new VersionBuilder(
|
2020-04-30 18:23:32 +00:00
|
|
|
cfd->current()->version_set()->file_options(), cfd->ioptions(),
|
|
|
|
cfd->table_cache(), v->storage_info(), v->version_set())),
|
2020-03-21 02:17:54 +00:00
|
|
|
version_(v) {
|
|
|
|
assert(version_ != cfd->current());
|
|
|
|
}
|
|
|
|
|
|
|
|
BaseReferencedVersionBuilder::~BaseReferencedVersionBuilder() {
|
|
|
|
version_->Unref();
|
|
|
|
}
|
|
|
|
|
2020-02-20 20:07:53 +00:00
|
|
|
} // namespace ROCKSDB_NAMESPACE
|