Merge pull request grpc#9612 from apolcyn/fix_csharp_benchmark_server…

…_startups revert setting of PayloadConfig in ServerConfig of non-generic server
rbsheth · Feb 9, 2017 · a68089b · a68089b
2 parents 4638d7a + e0aed71
commit a68089b
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 58 deletions.
diff --git a/src/proto/grpc/testing/control.proto b/src/proto/grpc/testing/control.proto
@@ -139,7 +139,10 @@ message ServerConfig {
   int32 async_server_threads = 7;
   // Specify the number of cores to limit server to, if desired
   int32 core_limit = 8;
-  // payload config, used in generic server
+  // payload config, used in generic server.
+  // Note this must NOT be used in proto (non-generic) servers. For proto servers,
+  // 'response sizes' must be configured from the 'response_size' field of the
+  // 'SimpleRequest' objects in RPC requests.
   PayloadConfig payload_config = 9;
 
   // Specify the cores we should run the server on, if desired