Bulk Setup Workload Improvements (#8573)

* bulk setup  workload improvements

* fix workload

* modify

fdbserver/include/fdbserver/workloads/BulkSetup.actor.h

@@ -252,7 +252,8 @@ Future<Void> bulkSetup(Database cx,
 	    .detail("NodeCount", nodeCount)
 	    .detail("ValuesInconsequential", valuesInconsequential)
 	    .detail("PostSetupWarming", postSetupWarming)
-	    .detail("MaxKeyInsertRate", maxKeyInsertRate);
+	    .detail("MaxKeyInsertRate", maxKeyInsertRate)
+	    .detail("NumTenants", tenants.size());
 
 	// For bulk data schemes where the value of the key is not critical to operation, check to
 	//  see if the database has already been set up.

fdbserver/workloads/BulkLoadWithTenants.actor.cpp

@@ -18,29 +18,33 @@
  * limitations under the License.
  */
 
+#include "fdbclient/TenantManagement.actor.h"
 #include "fdbrpc/ContinuousSample.h"
-#include "fdbclient/NativeAPI.actor.h"
+#include "fdbserver/Knobs.h"
 #include "fdbserver/TesterInterface.actor.h"
 #include "fdbserver/workloads/workloads.actor.h"
 #include "fdbserver/workloads/BulkSetup.actor.h"
+#include "flow/genericactors.actor.h"
 #include "flow/actorcompiler.h" // This must be the last #include.
 
 struct BulkSetupWorkload : TestWorkload {
-	static constexpr auto NAME = "BulkSetup";
+	static constexpr auto NAME = "BulkLoadWithTenants";
 
-	std::vector<TenantName> tenantNames;
 	int nodeCount;
 	double transactionsPerSecond;
 	Key keyPrefix;
+	double maxNumTenantsPerClient;
+	double minNumTenantsPerClient;
+	std::vector<TenantName> tenantNames;
 
 	BulkSetupWorkload(WorkloadContext const& wcx) : TestWorkload(wcx) {
 		transactionsPerSecond = getOption(options, "transactionsPerSecond"_sr, 5000.0) / clientCount;
 		nodeCount = getOption(options, "nodeCount"_sr, transactionsPerSecond * clientCount);
 		keyPrefix = unprintable(getOption(options, "keyPrefix"_sr, ""_sr).toString());
-		std::vector<std::string> tenants = getOption(options, "tenants"_sr, std::vector<std::string>());
+		// maximum and minimum number of tenants per client
-		for (std::string tenant : tenants) {
+		maxNumTenantsPerClient = getOption(options, "maxNumTenantsPerClient"_sr, 0);
-			tenantNames.push_back(TenantName(tenant));
+		minNumTenantsPerClient = getOption(options, "minNumTenantsPerClient"_sr, 0);
-		}
+		ASSERT(minNumTenantsPerClient <= maxNumTenantsPerClient);
 	}
 
 	void getMetrics(std::vector<PerfMetric>& m) override {}
@@ -51,6 +55,28 @@ struct BulkSetupWorkload : TestWorkload {
 
 	Standalone<KeyValueRef> operator()(int n) { return KeyValueRef(key(n), value((n + 1) % nodeCount)); }
 
+	ACTOR static Future<Void> _setup(BulkSetupWorkload* workload, Database cx) {
+		// create a bunch of tenants (between min and max tenants)
+		state int numTenantsToCreate =
+		    deterministicRandom()->randomInt(workload->minNumTenantsPerClient, workload->maxNumTenantsPerClient + 1);
+		TraceEvent("BulkSetupTenantCreation").detail("NumTenants", numTenantsToCreate);
+		if (numTenantsToCreate > 0) {
+			std::vector<Future<Void>> tenantFutures;
+			for (int i = 0; i < numTenantsToCreate; i++) {
+				TenantMapEntry entry;
+				entry.encrypted = SERVER_KNOBS->ENABLE_ENCRYPTION;
+				workload->tenantNames.push_back(TenantName(format("BulkSetupTenant_%04d_%04d", workload->clientId, i)));
+				TraceEvent("CreatingTenant")
+				    .detail("Tenant", workload->tenantNames.back())
+				    .detail("TenantGroup", entry.tenantGroup);
+				tenantFutures.push_back(
+				    success(TenantAPI::createTenant(cx.getReference(), workload->tenantNames.back())));
+			}
+			wait(waitForAll(tenantFutures));
+		}
+		return Void();
+	}
+
 	Future<Void> start(Database const& cx) override {
 		return bulkSetup(cx,
 		                 this,
@@ -65,9 +91,11 @@ struct BulkSetupWorkload : TestWorkload {
 		                 0.1,
 		                 0,
 		                 0,
-		                 this->tenantNames);
+		                 tenantNames);
 	}
 
+	Future<Void> setup(Database const& cx) override { return _setup(this, cx); }
+
 	Future<bool> check(Database const& cx) override { return true; }
 };
 

tests/fast/EncryptedBackupCorrectness.toml

@@ -7,29 +7,15 @@ enable_tlog_encryption = true
 enable_storage_server_encryption = false
 enable_blob_granule_encryption = true
 
-[[test]]
-testTitle = 'TenantCreation'
-
-    [[test.workload]]
-    testName = 'CreateTenant'
-    name = 'First'
-
-    [[test.workload]]
-    testName = 'CreateTenant'
-    name = 'Second'
-
-    [[test.workload]]
-    testName = 'CreateTenant'
-    name = 'Third'
-
 [[test]]
 testTitle = 'EncryptedBackupAndRestore'
 clearAfterTest = false
 simBackupAgents = 'BackupToFile'
 
     [[test.workload]]
-    testName = 'BulkSetup'
+    testName = 'BulkLoadWithTenants'
-    tenants = 'First,Second,Third'
+    maxNumTenantsPerClient = 100
+    minNumTenantsPerClient = 0
     transactionsPerSecond = 2500.0
 
     [[test.workload]]