From b3a6fb7e86078e111b4d83eeb254a41cf4c7525f Mon Sep 17 00:00:00 2001
From: Peter Dillinger <peterd@fb.com>
Date: Wed, 13 Apr 2022 17:10:43 -0700
Subject: [PATCH] Serialize a space-hungry test (#9837)

Summary:
Tends to fill up /dev/shm

Pull Request resolved: https://github.com/facebook/rocksdb/pull/9837

Test Plan: Some manual testing

Reviewed By: hx235

Differential Revision: D35627568

Pulled By: pdillinger

fbshipit-source-id: 22710f7b10bc287570475dae42318dd346f78db9
---
 Makefile                   | 3 +++
 db/db_bloom_filter_test.cc | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index b251fdc16..380deb0b3 100644
--- a/Makefile
+++ b/Makefile
@@ -618,10 +618,13 @@ ROCKSDBTESTS_SUBSET ?= $(TESTS)
 # env_test - suspicious use of test::TmpDir
 # deletefile_test - serial because it generates giant temporary files in
 #   its various tests. Parallel can fill up your /dev/shm
+# db_bloom_filter_test - serial because excessive space usage by instances
+#   of DBFilterConstructionReserveMemoryTestWithParam can fill up /dev/shm
 NON_PARALLEL_TEST = \
 	c_test \
 	env_test \
 	deletefile_test \
+	db_bloom_filter_test \
 
 PARALLEL_TEST = $(filter-out $(NON_PARALLEL_TEST), $(TESTS))
 
diff --git a/db/db_bloom_filter_test.cc b/db/db_bloom_filter_test.cc
index ab244efd6..7aec18bdc 100644
--- a/db/db_bloom_filter_test.cc
+++ b/db/db_bloom_filter_test.cc
@@ -1074,7 +1074,8 @@ class DBFilterConstructionReserveMemoryTestWithParam
 };
 
 INSTANTIATE_TEST_CASE_P(
-    BlockBasedTableOptions, DBFilterConstructionReserveMemoryTestWithParam,
+    DBFilterConstructionReserveMemoryTestWithParam,
+    DBFilterConstructionReserveMemoryTestWithParam,
     ::testing::Values(std::make_tuple(false, kFastLocalBloom, false, false),
 
                       std::make_tuple(true, kFastLocalBloom, false, false),
@@ -1090,7 +1091,7 @@ INSTANTIATE_TEST_CASE_P(
                       std::make_tuple(true, kDeprecatedBlock, false, false),
                       std::make_tuple(true, kLegacyBloom, false, false)));
 
-// TODO: Speed up this test.
+// TODO: Speed up this test, and reduce disk space usage (~700MB)
 // The current test inserts many keys (on the scale of dummy entry size)
 // in order to make small memory user (e.g, final filter, partitioned hash
 // entries/filter/banding) , which is proportional to the number of