MB-51328: Reduce shard / vbucket count for KVStoreBackend tests

Running with the full 1024 vbuckets and shards slows down tests which check the handling of the complete vBucket set. Reduce to 16 vBuckets and 2 shards by default. Change-Id: I2214322f82bbef3b63b02f63510e19c217725709 Reviewed-on: https://review.couchbase.org/c/kv_engine/+/172051 Reviewed-by: Jim Walker <jim@couchbase.com> Tested-by: Build Bot <build@couchbase.com>
couchbase · Mar 10, 2022 · 682fa05 · 682fa05
1 parent e8db0fc
commit 682fa05
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/engines/ep/src/kvstore/rocksdb-kvstore/rocksdb-kvstore.cc b/engines/ep/src/kvstore/rocksdb-kvstore/rocksdb-kvstore.cc
@@ -497,6 +497,13 @@ void RocksDBKVStore::openDB() {
 }
 
 std::shared_ptr<VBHandle> RocksDBKVStore::getVBHandle(Vbid vbid) const {
+    if (vbid.get() >= configuration.getMaxVBuckets()) {
+        throw std::invalid_argument(
+                fmt::format("RocksDBKVStore::getVBHandle: {} exceeds valid "
+                            "vBucket range (0..{})",
+                            vbid,
+                            configuration.getMaxVBuckets() - 1));
+    }
     std::lock_guard<std::mutex> lg(vbhMutex);
     if (vbHandles[vbid.get()]) {
         return vbHandles[vbid.get()];

diff --git a/engines/ep/tests/module_tests/kvstore_test.cc b/engines/ep/tests/module_tests/kvstore_test.cc
@@ -287,9 +287,14 @@ void KVStoreBackend::setup(const std::string& dataDir,
     configStr += generateBackendConfig("persistent_" + backend) + ";";
 
     if (backend == "magma") {
-        configStr += magmaConfig;
+        configStr += magmaConfig + ';';
     }
 
+    // Run with a fixed (and lower than default) number of shards and vBuckets -
+    // we rarely need all 1024 vBuckets or shards, and running with smaller
+    // numbers makes tests faster / consume less memory etc.
+    configStr += "max_vbuckets=16;max_num_shards=2";
+
     config.parseConfiguration(configStr.c_str(), get_mock_server_api());
     WorkLoadPolicy workload(config.getMaxNumWorkers(),
                             config.getMaxNumShards());
@@ -1189,7 +1194,7 @@ TEST_P(KVStoreParamTest, GetItemCount) {
 // Verify the negative behavour of getItemCount - if the given vbucket doens't
 // exist then getItemCount should throw std::system_error.
 TEST_P(KVStoreParamTest, GetItemCountInvalidVBucket) {
-    EXPECT_THROW(kvstore->getItemCount(Vbid{123}), std::system_error);
+    EXPECT_THROW(kvstore->getItemCount(Vbid{12}), std::system_error);
 }
 
 TEST_P(KVStoreParamTest, DeletedItemsForNoDeletesScanMovesLastReadSeqno) {