diff --git a/documentation/sphinx/source/mr-status-json-schemas.rst.inc b/documentation/sphinx/source/mr-status-json-schemas.rst.inc index a8d82794e3..80302ed4f7 100644 --- a/documentation/sphinx/source/mr-status-json-schemas.rst.inc +++ b/documentation/sphinx/source/mr-status-json-schemas.rst.inc @@ -700,7 +700,7 @@ "ssd", "ssd-1", "ssd-2", - "ssd-redwood-experimental", + "ssd-redwood-1-experimental", "ssd-rocksdb-experimental", "memory", "memory-1", @@ -713,7 +713,7 @@ "ssd", "ssd-1", "ssd-2", - "ssd-redwood-experimental", + "ssd-redwood-1-experimental", "ssd-rocksdb-experimental", "memory", "memory-1", diff --git a/documentation/sphinx/source/tss.rst b/documentation/sphinx/source/tss.rst index 7d27190532..215e9967b9 100644 --- a/documentation/sphinx/source/tss.rst +++ b/documentation/sphinx/source/tss.rst @@ -31,7 +31,7 @@ Because TSS recruitment only pairs *new* storage processes, you must add process Example commands ---------------- -Set the desired TSS processes count to 4, using the redwood storage engine: ``configure tss ssd-redwood-experimental count=4``. +Set the desired TSS processes count to 4, using the redwood storage engine: ``configure tss ssd-redwood-1-experimental count=4``. Change the desired TSS process count to 2: ``configure tss count=2``. diff --git a/fdbclient/DatabaseConfiguration.cpp b/fdbclient/DatabaseConfiguration.cpp index d778b35845..cef31d134e 100644 --- a/fdbclient/DatabaseConfiguration.cpp +++ b/fdbclient/DatabaseConfiguration.cpp @@ -288,7 +288,7 @@ StatusObject DatabaseConfiguration::toJSON(bool noPolicies) const { result["storage_engine"] = "ssd-2"; } else if (tLogDataStoreType == KeyValueStoreType::SSD_BTREE_V2 && storageServerStoreType == KeyValueStoreType::SSD_REDWOOD_V1) { - result["storage_engine"] = "ssd-redwood-experimental"; + result["storage_engine"] = "ssd-redwood-1-experimental"; } else if (tLogDataStoreType == KeyValueStoreType::SSD_BTREE_V2 && storageServerStoreType == KeyValueStoreType::SSD_ROCKSDB_V1) { result["storage_engine"] = "ssd-rocksdb-experimental"; @@ -311,7 +311,7 @@ StatusObject DatabaseConfiguration::toJSON(bool noPolicies) const { } else if (testingStorageServerStoreType == KeyValueStoreType::SSD_BTREE_V2) { result["tss_storage_engine"] = "ssd-2"; } else if (testingStorageServerStoreType == KeyValueStoreType::SSD_REDWOOD_V1) { - result["tss_storage_engine"] = "ssd-redwood-experimental"; + result["tss_storage_engine"] = "ssd-redwood-1-experimental"; } else if (testingStorageServerStoreType == KeyValueStoreType::SSD_ROCKSDB_V1) { result["tss_storage_engine"] = "ssd-rocksdb-experimental"; } else if (testingStorageServerStoreType == KeyValueStoreType::MEMORY_RADIXTREE) { diff --git a/fdbclient/FDBTypes.h b/fdbclient/FDBTypes.h index d0eb4c0d0b..db52ea26dd 100644 --- a/fdbclient/FDBTypes.h +++ b/fdbclient/FDBTypes.h @@ -706,7 +706,7 @@ struct KeyValueStoreType { case SSD_BTREE_V2: return "ssd-2"; case SSD_REDWOOD_V1: - return "ssd-redwood-experimental"; + return "ssd-redwood-1-experimental"; case SSD_ROCKSDB_V1: return "ssd-rocksdb-experimental"; case MEMORY: diff --git a/fdbclient/ManagementAPI.actor.cpp b/fdbclient/ManagementAPI.actor.cpp index 53e9dba1a8..c8a06c5481 100644 --- a/fdbclient/ManagementAPI.actor.cpp +++ b/fdbclient/ManagementAPI.actor.cpp @@ -184,7 +184,7 @@ std::map configForToken(std::string const& mode) { } else if (mode == "ssd" || mode == "ssd-2") { logType = KeyValueStoreType::SSD_BTREE_V2; storeType = KeyValueStoreType::SSD_BTREE_V2; - } else if (mode == "ssd-redwood-experimental") { + } else if (mode == "ssd-redwood-1-experimental") { logType = KeyValueStoreType::SSD_BTREE_V2; storeType = KeyValueStoreType::SSD_REDWOOD_V1; } else if (mode == "ssd-rocksdb-experimental") { diff --git a/fdbclient/Schemas.cpp b/fdbclient/Schemas.cpp index e99aafd21a..10f77d7638 100644 --- a/fdbclient/Schemas.cpp +++ b/fdbclient/Schemas.cpp @@ -728,7 +728,7 @@ const KeyRef JSONSchemas::statusSchema = LiteralStringRef(R"statusSchema( "ssd", "ssd-1", "ssd-2", - "ssd-redwood-experimental", + "ssd-redwood-1-experimental", "ssd-rocksdb-experimental", "memory", "memory-1", @@ -741,7 +741,7 @@ const KeyRef JSONSchemas::statusSchema = LiteralStringRef(R"statusSchema( "ssd", "ssd-1", "ssd-2", - "ssd-redwood-experimental", + "ssd-redwood-1-experimental", "ssd-rocksdb-experimental", "memory", "memory-1", diff --git a/fdbserver/SimulatedCluster.actor.cpp b/fdbserver/SimulatedCluster.actor.cpp index 62d1f71db9..c1cb7d1e8f 100644 --- a/fdbserver/SimulatedCluster.actor.cpp +++ b/fdbserver/SimulatedCluster.actor.cpp @@ -278,7 +278,7 @@ public: // 0 = "ssd" // 1 = "memory" // 2 = "memory-radixtree-beta" - // 3 = "ssd-redwood-experimental" + // 3 = "ssd-redwood-1-experimental" // 4 = "ssd-rocksdb-experimental" // Requires a comma-separated list of numbers WITHOUT whitespaces std::vector storageEngineExcludeTypes; @@ -1339,7 +1339,7 @@ void SimulationConfig::setStorageEngine(const TestConfig& testConfig) { } case 3: { TEST(true); // Simulated cluster using redwood storage engine - set_config("ssd-redwood-experimental"); + set_config("ssd-redwood-1-experimental"); break; } case 4: { diff --git a/fdbserver/VersionedBTree.actor.cpp b/fdbserver/VersionedBTree.actor.cpp index 2ae64a8587..58a56508d7 100644 --- a/fdbserver/VersionedBTree.actor.cpp +++ b/fdbserver/VersionedBTree.actor.cpp @@ -9133,7 +9133,7 @@ TEST_CASE("Lredwood/correctness/btree") { g_redwoodMetricsActor = Void(); // Prevent trace event metrics from starting g_redwoodMetrics.clear(); - state std::string fileName = params.get("Filename").orDefault("unittest_pageFile.redwood"); + state std::string fileName = params.get("Filename").orDefault("unittest_pageFile.redwood-v1"); IPager2* pager; state bool serialTest = params.getInt("serialTest").orDefault(deterministicRandom()->random01() < 0.25); @@ -9524,7 +9524,7 @@ ACTOR Future randomScans(VersionedBTree* btree, } TEST_CASE(":/redwood/correctness/pager/cow") { - state std::string pagerFile = "unittest_pageFile.redwood"; + state std::string pagerFile = "unittest_pageFile.redwood-v1"; printf("Deleting old test data\n"); deleteFile(pagerFile); @@ -9573,7 +9573,7 @@ TEST_CASE(":/redwood/performance/extentQueue") { state DWALPager* pager; // If a test file is passed in by environment then don't write new data to it. state bool reload = getenv("TESTFILE") == nullptr; - state std::string fileName = reload ? "unittest.redwood" : getenv("TESTFILE"); + state std::string fileName = reload ? "unittest.redwood-v1" : getenv("TESTFILE"); if (reload) { printf("Deleting old test data\n"); @@ -9723,7 +9723,7 @@ TEST_CASE(":/redwood/performance/extentQueue") { TEST_CASE(":/redwood/performance/set") { state SignalableActorCollection actors; - state std::string fileName = params.get("Filename").orDefault("unittest.redwood"); + state std::string fileName = params.get("Filename").orDefault("unittest.redwood-v1"); state int pageSize = params.getInt("pageSize").orDefault(SERVER_KNOBS->REDWOOD_DEFAULT_PAGE_SIZE); state int extentSize = params.getInt("extentSize").orDefault(SERVER_KNOBS->REDWOOD_DEFAULT_EXTENT_SIZE); state int64_t pageCacheBytes = params.getInt("pageCacheBytes").orDefault(FLOW_KNOBS->PAGE_CACHE_4K); @@ -10254,9 +10254,9 @@ ACTOR Future doPrefixInsertComparison(int suffixSize, bool usePrefixesInOrder, KVSource source) { - deleteFile("test.redwood"); + deleteFile("test.redwood-v1"); wait(delay(5)); - state IKeyValueStore* redwood = openKVStore(KeyValueStoreType::SSD_REDWOOD_V1, "test.redwood", UID(), 0); + state IKeyValueStore* redwood = openKVStore(KeyValueStoreType::SSD_REDWOOD_V1, "test.redwood-v1", UID(), 0); wait(prefixClusteredInsert(redwood, suffixSize, valueSize, source, recordCountTarget, usePrefixesInOrder, true)); wait(closeKVS(redwood)); printf("\n"); @@ -10298,9 +10298,9 @@ TEST_CASE(":/redwood/performance/sequentialInsert") { state int valueSize = params.getInt("valueSize").orDefault(100); state int recordCountTarget = params.getInt("recordCountTarget").orDefault(100e6); - deleteFile("test.redwood"); + deleteFile("test.redwood-v1"); wait(delay(5)); - state IKeyValueStore* redwood = openKVStore(KeyValueStoreType::SSD_REDWOOD_V1, "test.redwood", UID(), 0); + state IKeyValueStore* redwood = openKVStore(KeyValueStoreType::SSD_REDWOOD_V1, "test.redwood-v1", UID(), 0); wait(sequentialInsert(redwood, prefixLen, valueSize, recordCountTarget)); wait(closeKVS(redwood)); printf("\n"); @@ -10378,9 +10378,9 @@ TEST_CASE(":/redwood/performance/randomRangeScans") { state KVSource source({ { prefixLen, 1000 } }); - deleteFile("test.redwood"); + deleteFile("test.redwood-v1"); wait(delay(5)); - state IKeyValueStore* redwood = openKVStore(KeyValueStoreType::SSD_REDWOOD_V1, "test.redwood", UID(), 0); + state IKeyValueStore* redwood = openKVStore(KeyValueStoreType::SSD_REDWOOD_V1, "test.redwood-v1", UID(), 0); wait(prefixClusteredInsert( redwood, suffixSize, valueSize, source, writeRecordCountTarget, writePrefixesInOrder, false)); diff --git a/fdbserver/worker.actor.cpp b/fdbserver/worker.actor.cpp index dce9bba3c1..f1b68ee680 100644 --- a/fdbserver/worker.actor.cpp +++ b/fdbserver/worker.actor.cpp @@ -308,7 +308,7 @@ KeyValueStoreSuffix bTreeV1Suffix = { KeyValueStoreType::SSD_BTREE_V1, ".fdb", F KeyValueStoreSuffix bTreeV2Suffix = { KeyValueStoreType::SSD_BTREE_V2, ".sqlite", FilesystemCheck::FILES_ONLY }; KeyValueStoreSuffix memorySuffix = { KeyValueStoreType::MEMORY, "-0.fdq", FilesystemCheck::FILES_ONLY }; KeyValueStoreSuffix memoryRTSuffix = { KeyValueStoreType::MEMORY_RADIXTREE, "-0.fdr", FilesystemCheck::FILES_ONLY }; -KeyValueStoreSuffix redwoodSuffix = { KeyValueStoreType::SSD_REDWOOD_V1, ".redwood", FilesystemCheck::FILES_ONLY }; +KeyValueStoreSuffix redwoodSuffix = { KeyValueStoreType::SSD_REDWOOD_V1, ".redwood-v1", FilesystemCheck::FILES_ONLY }; KeyValueStoreSuffix rocksdbSuffix = { KeyValueStoreType::SSD_ROCKSDB_V1, ".rocksdb", FilesystemCheck::DIRECTORIES_ONLY }; @@ -338,7 +338,7 @@ std::string filenameFromId(KeyValueStoreType storeType, std::string folder, std: else if (storeType == KeyValueStoreType::MEMORY || storeType == KeyValueStoreType::MEMORY_RADIXTREE) return joinPath(folder, prefix + id.toString() + "-"); else if (storeType == KeyValueStoreType::SSD_REDWOOD_V1) - return joinPath(folder, prefix + id.toString() + ".redwood"); + return joinPath(folder, prefix + id.toString() + ".redwood-v1"); else if (storeType == KeyValueStoreType::SSD_ROCKSDB_V1) return joinPath(folder, prefix + id.toString() + ".rocksdb"); diff --git a/fdbserver/workloads/KVStoreTest.actor.cpp b/fdbserver/workloads/KVStoreTest.actor.cpp index acf4dc6532..59598043b9 100644 --- a/fdbserver/workloads/KVStoreTest.actor.cpp +++ b/fdbserver/workloads/KVStoreTest.actor.cpp @@ -383,7 +383,7 @@ ACTOR Future testKVStore(KVStoreTestWorkload* workload) { test.store = keyValueStoreSQLite(fn, id, KeyValueStoreType::SSD_BTREE_V1); else if (workload->storeType == "ssd-2") test.store = keyValueStoreSQLite(fn, id, KeyValueStoreType::SSD_REDWOOD_V1); - else if (workload->storeType == "ssd-redwood-experimental") + else if (workload->storeType == "ssd-redwood-1-experimental") test.store = keyValueStoreRedwoodV1(fn, id); else if (workload->storeType == "ssd-rocksdb-experimental") test.store = keyValueStoreRocksDB(fn, id, KeyValueStoreType::SSD_ROCKSDB_V1); diff --git a/tests/KVStoreTest.txt b/tests/KVStoreTest.txt index 97eb709703..ca8774194a 100644 --- a/tests/KVStoreTest.txt +++ b/tests/KVStoreTest.txt @@ -60,7 +60,7 @@ setup=true clear=false count=false useDB=false -storeType=ssd-redwood-experimental +storeType=ssd-redwood-1-experimental filename=bttest-redwood testTitle=Scan @@ -76,7 +76,7 @@ setup=false clear=false count=true useDB=false -storeType=ssd-redwood-experimental +storeType=ssd-redwood-1-experimental filename=bttest-redwood testTitle=RandomWriteSaturation @@ -93,5 +93,5 @@ setup=false clear=false count=false useDB=false -storeType=ssd-redwood-experimental +storeType=ssd-redwood-1-experimental filename=bttest-redwood