test(storage): control gRPC background thread count (#9570)

coryan · web-flow · commit 4b06efd67f8e · 2022-07-27T03:41:36.000Z
diff --git a/google/cloud/storage/benchmarks/storage_throughput_vs_cpu_benchmark.cc b/google/cloud/storage/benchmarks/storage_throughput_vs_cpu_benchmark.cc
@@ -219,7 +219,13 @@ int main(int argc, char* argv[]) {
 
   std::cout << "\n# Api Version Path: "
             << options->target_api_version_path.value_or("[default]")
-            << "\n# Build info: " << notes << "\n";
+            << "\n# Grpc Background Threads: ";
+  if (options->grpc_background_threads.has_value()) {
+    std::cout << *options->grpc_background_threads;
+  } else {
+    std::cout << "[default]";
+  }
+  std::cout << "\n# Build info: " << notes << "\n";
   // Make the output generated so far immediately visible, helps with debugging.
   std::cout << std::flush;
 
@@ -297,6 +303,10 @@ gcs_bm::ClientProvider BaseProvider(ThroughputOptions const& options) {
     }
 #if GOOGLE_CLOUD_CPP_STORAGE_HAVE_GRPC
     using ::google::cloud::storage_experimental::DefaultGrpcClient;
+    if (options.grpc_background_threads.has_value()) {
+      opts.set<google::cloud::GrpcBackgroundThreadPoolSizeOption>(
+          *options.grpc_background_threads);
+    }
     if (t == ExperimentTransport::kDirectPath) {
       if (options.direct_path_channel_count > 0) {
         opts.set<google::cloud::GrpcNumChannelsOption>(
diff --git a/google/cloud/storage/benchmarks/throughput_options.cc b/google/cloud/storage/benchmarks/throughput_options.cc
@@ -251,6 +251,11 @@ google::cloud::StatusOr<ThroughputOptions> ParseThroughputOptions(
        [&options](std::string const& val) {
          options.target_api_version_path = val;
        }},
+      {"--grpc-background-threads",
+       "change the default number of gRPC background threads",
+       [&options](std::string const& val) {
+         options.grpc_background_threads = std::stoi(val);
+       }},
   };
   auto usage = BuildUsage(desc, argv[0]);
 
@@ -379,6 +384,12 @@ google::cloud::StatusOr<ThroughputOptions> ParseThroughputOptions(
                                   options.read_size_quantum);
   if (!status.ok()) return status;
 
+  if (options.grpc_background_threads.value_or(1) <= 0) {
+    std::ostringstream os;
+    os << "Invalid value for --grpc-background-threads";
+    return make_status(os);
+  }
+
   return options;
 }
 
diff --git a/google/cloud/storage/benchmarks/throughput_options.h b/google/cloud/storage/benchmarks/throughput_options.h
@@ -69,6 +69,7 @@ struct ThroughputOptions {
   std::int64_t maximum_read_size = 0;
   std::int64_t read_size_quantum = 128 * kKiB;
   absl::optional<std::string> target_api_version_path;
+  absl::optional<int> grpc_background_threads;
 };
 
 google::cloud::StatusOr<ThroughputOptions> ParseThroughputOptions(
diff --git a/google/cloud/storage/benchmarks/throughput_options_test.cc b/google/cloud/storage/benchmarks/throughput_options_test.cc
@@ -64,6 +64,7 @@ TEST(ThroughputOptions, Basic) {
       "--maximum-read-size=64KiB",
       "--read-size-quantum=16KiB",
       "--target-api-version-path=vN",
+      "--grpc-background-threads=16",
   });
   ASSERT_STATUS_OK(options);
   EXPECT_EQ("test-project", options->project_id);
@@ -99,6 +100,7 @@ TEST(ThroughputOptions, Basic) {
   EXPECT_EQ(std::chrono::seconds(86401), options->download_stall_timeout);
   EXPECT_EQ(std::chrono::milliseconds(250), options->minimum_sample_delay);
   EXPECT_EQ("vN", options->target_api_version_path.value_or(""));
+  EXPECT_EQ(16, options->grpc_background_threads.value_or(0));
 }
 
 TEST(ThroughputOptions, Description) {
@@ -291,6 +293,16 @@ TEST(ThroughputOptions, Validate) {
       "--maximum-read-size=8",
       "--read-size-quantum=5",
   }));
+  EXPECT_FALSE(ParseThroughputOptions({
+      "self-test",
+      "--region=r",
+      "--grpc-background-threads=0",
+  }));
+  EXPECT_FALSE(ParseThroughputOptions({
+      "self-test",
+      "--region=r",
+      "--grpc-background-threads=-1",
+  }));
 }
 
 }  // namespace
