Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run Merge with Integrated BlobDB in stress, crash and db_bench #8461

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
### New Features
* ldb has a new feature, `list_live_files_metadata`, that shows the live SST files, as well as their LSM storage level and the column family they belong to.
* The new BlobDB implementation now tracks the amount of garbage in each blob file in the MANIFEST.
* Integrated BlobDB now supports Merge with base values (Put/Delete etc.).

## 6.22.0 (2021-06-18)
### Behavior Changes
Expand Down
6 changes: 3 additions & 3 deletions db_stress_tool/db_stress_test_base.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2357,10 +2357,10 @@ void StressTest::Open() {

if ((options_.enable_blob_files || options_.enable_blob_garbage_collection ||
FLAGS_allow_setting_blob_options_dynamically) &&
(FLAGS_use_merge || FLAGS_best_efforts_recovery)) {
FLAGS_best_efforts_recovery) {
fprintf(stderr,
"Integrated BlobDB is currently incompatible with Merge, "
"and best-effort recovery\n");
"Integrated BlobDB is currently incompatible with best-effort "
"recovery\n");
exit(1);
}

Expand Down
7 changes: 0 additions & 7 deletions tools/db_bench_tool.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7840,13 +7840,6 @@ int db_bench_tool(int argc, char** argv) {
exit(1);
}

if ((FLAGS_enable_blob_files || FLAGS_enable_blob_garbage_collection) &&
!FLAGS_merge_operator.empty()) {
fprintf(stderr,
"Integrated BlobDB is currently incompatible with Merge.\n");
exit(1);
}

ROCKSDB_NAMESPACE::Benchmark benchmark;
benchmark.Run();

Expand Down
2 changes: 0 additions & 2 deletions tools/db_crashtest.py
Original file line number Diff line number Diff line change
Expand Up @@ -280,8 +280,6 @@ def is_direct_io_supported(dbname):
"blob_compression_type": lambda: random.choice(["none", "snappy", "lz4", "zstd"]),
"enable_blob_garbage_collection": lambda: random.choice([0] + [1] * 3),
"blob_garbage_collection_age_cutoff": lambda: random.choice([0.0, 0.25, 0.5, 0.75, 1.0]),
# The following are currently incompatible with the integrated BlobDB
"use_merge": 0,
}

ts_params = {
Expand Down