Remove host option from ServerConfig proto since it is error-prone and

may cause inter-language confusion.
9 years ago · 5919e81ff1
parent 50d012bb82
commit 5919e81ff1
14 changed files with 13 additions and 25 deletions
--- a/src/node/performance/worker_service_impl.js
+++ b/src/node/performance/worker_service_impl.js
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015, Google Inc.
+ * Copyright 2015-2016, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@ -99,7 +99,7 @@ exports.runServer = function runServer(call) {
    var stats;
    switch (request.argtype) {
      case 'setup':
-      server = new BenchmarkServer(request.setup.host, request.setup.port,
+      server = new BenchmarkServer('[::]', request.setup.port,
                                   request.setup.security_params);
      server.start();
      stats = server.mark();
--- a/src/proto/grpc/testing/control.proto
+++ b/src/proto/grpc/testing/control.proto
@ -127,8 +127,6 @@ message ClientArgs {
 message ServerConfig {
  ServerType server_type = 1;
  SecurityParams security_params = 2;
-  // Host on which to listen.
-  string host = 3;
  // Port on which to listen. Zero means pick unused port.
  int32 port = 4;
  // Only for async server. Number of threads used to serve the requests.
--- a/test/cpp/qps/async_streaming_ping_pong_test.cc
+++ b/test/cpp/qps/async_streaming_ping_pong_test.cc
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015, Google Inc.
+ * Copyright 2015-2016, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@ -58,7 +58,6 @@ static void RunAsyncStreamingPingPong() {

  ServerConfig server_config;
  server_config.set_server_type(ASYNC_SERVER);
-  server_config.set_host("localhost");
  server_config.set_async_server_threads(1);

  const auto result =
--- a/test/cpp/qps/async_unary_ping_pong_test.cc
+++ b/test/cpp/qps/async_unary_ping_pong_test.cc
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015, Google Inc.
+ * Copyright 2015-2016, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@ -58,7 +58,6 @@ static void RunAsyncUnaryPingPong() {

  ServerConfig server_config;
  server_config.set_server_type(ASYNC_SERVER);
-  server_config.set_host("localhost");
  server_config.set_async_server_threads(1);

  const auto result =
--- a/test/cpp/qps/generic_async_streaming_ping_pong_test.cc
+++ b/test/cpp/qps/generic_async_streaming_ping_pong_test.cc
@ -61,7 +61,6 @@ static void RunGenericAsyncStreamingPingPong() {

  ServerConfig server_config;
  server_config.set_server_type(ASYNC_GENERIC_SERVER);
-  server_config.set_host("localhost");
  server_config.set_async_server_threads(1);

  const auto result =
--- a/test/cpp/qps/qps_driver.cc
+++ b/test/cpp/qps/qps_driver.cc
@ -153,7 +153,6 @@ static void QpsDriver() {

  ServerConfig server_config;
  server_config.set_server_type(server_type);
-  server_config.set_host("::");  // Use the wildcard server address
  server_config.set_async_server_threads(FLAGS_async_server_threads);

  if (FLAGS_secure_test) {
--- a/test/cpp/qps/qps_openloop_test.cc
+++ b/test/cpp/qps/qps_openloop_test.cc
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015, Google Inc.
+ * Copyright 2015-2016, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@ -59,7 +59,6 @@ static void RunQPS() {

  ServerConfig server_config;
  server_config.set_server_type(ASYNC_SERVER);
-  server_config.set_host("localhost");
  server_config.set_async_server_threads(4);

  const auto result =
--- a/test/cpp/qps/qps_test.cc
+++ b/test/cpp/qps/qps_test.cc
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015, Google Inc.
+ * Copyright 2015-2016, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@ -58,7 +58,6 @@ static void RunQPS() {

  ServerConfig server_config;
  server_config.set_server_type(ASYNC_SERVER);
-  server_config.set_host("localhost");
  server_config.set_async_server_threads(8);

  const auto result =
--- a/test/cpp/qps/qps_test_with_poll.cc
+++ b/test/cpp/qps/qps_test_with_poll.cc
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015, Google Inc.
+ * Copyright 2015-2016, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@ -62,7 +62,6 @@ static void RunQPS() {

  ServerConfig server_config;
  server_config.set_server_type(ASYNC_SERVER);
-  server_config.set_host("localhost");
  server_config.set_async_server_threads(4);

  const auto result =
--- a/test/cpp/qps/secure_sync_unary_ping_pong_test.cc
+++ b/test/cpp/qps/secure_sync_unary_ping_pong_test.cc
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015, Google Inc.
+ * Copyright 2015-2016, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@ -57,7 +57,6 @@ static void RunSynchronousUnaryPingPong() {

  ServerConfig server_config;
  server_config.set_server_type(SYNC_SERVER);
-  server_config.set_host("localhost");

  // Set up security params
  SecurityParams security;
--- a/test/cpp/qps/server_async.cc
+++ b/test/cpp/qps/server_async.cc
@ -76,7 +76,7 @@ class AsyncQpsServerTest : public Server {
      : Server(config) {
    char *server_address = NULL;

-    gpr_join_host_port(&server_address, config.host().c_str(), port());
+    gpr_join_host_port(&server_address, "::", port());

    ServerBuilder builder;
    builder.AddListeningPort(server_address,
--- a/test/cpp/qps/server_sync.cc
+++ b/test/cpp/qps/server_sync.cc
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015, Google Inc.
+ * Copyright 2015-2016, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@ -89,7 +89,7 @@ class SynchronousServer GRPC_FINAL : public grpc::testing::Server {

    char* server_address = NULL;

-    gpr_join_host_port(&server_address, config.host().c_str(), port());
+    gpr_join_host_port(&server_address, "::", port());
    builder.AddListeningPort(server_address,
                             Server::CreateServerCredentials(config));
    gpr_free(server_address);
--- a/test/cpp/qps/sync_streaming_ping_pong_test.cc
+++ b/test/cpp/qps/sync_streaming_ping_pong_test.cc
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015, Google Inc.
+ * Copyright 2015-2016, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@ -57,7 +57,6 @@ static void RunSynchronousStreamingPingPong() {

  ServerConfig server_config;
  server_config.set_server_type(SYNC_SERVER);
-  server_config.set_host("localhost");

  const auto result =
      RunScenario(client_config, 1, server_config, 1, WARMUP, BENCHMARK, -2);
--- a/test/cpp/qps/sync_unary_ping_pong_test.cc
+++ b/test/cpp/qps/sync_unary_ping_pong_test.cc
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015, Google Inc.
+ * Copyright 2015-2016, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@ -57,7 +57,6 @@ static void RunSynchronousUnaryPingPong() {

  ServerConfig server_config;
  server_config.set_server_type(SYNC_SERVER);
-  server_config.set_host("localhost");

  const auto result =
      RunScenario(client_config, 1, server_config, 1, WARMUP, BENCHMARK, -2);