commit 8b3b918ebd55911a3102f5ea6da60906fa63c866
author Lukacs Berki <lberki@google.com> Thu Apr 14 08:29:05 2016 +0000
committer Dmitry Lomov <dslomov@google.com> Thu Apr 14 11:11:15 2016 +0000
tree 5441d1a77d4f89a3450523979b49f8aa63fe4596
parent 386f242788a3d0189e6882466105c57ec1149d20

Add the --grpc_port startup option and start a Java server if it's passed in.

Note that the presence of server/grpc_port does not guarantee that the server actually listens to it and we can't guarantee it, either, because it can always be kill -9'd.

I haven't decided yet how the transition between AF_UNIX and gRPC will work. For now, I'm happy that we can start up a Java server.

The way to get the kernel-chosen port is truly awful, but it is apparently impossible to do so in a different way:

https://github.com/grpc/grpc-java/issues/72

--
MOS_MIGRATED_REVID=119828354

src/main/cpp/blaze_startup_options_common.cc

diff --git a/src/main/cpp/blaze_startup_options_common.cc b/src/main/cpp/blaze_startup_options_common.cc
index 428e8f7..54a6499 100644
--- a/src/main/cpp/blaze_startup_options_common.cc
+++ b/src/main/cpp/blaze_startup_options_common.cc
@@ -50,7 +50,7 @@
   // 3 hours (but only 5 seconds if used within a test)
   max_idle_secs = testing ? 5 : (3 * 3600);
   oom_more_eagerly_threshold = 100;
-  webstatus_port = 0;
+  grpc_port = -1;
   oom_more_eagerly = false;
   watchfs = false;
   invocation_policy = NULL;
@@ -81,7 +81,7 @@
   lhs->batch_cpu_scheduling = rhs.batch_cpu_scheduling;
   lhs->io_nice_level = rhs.io_nice_level;
   lhs->max_idle_secs = rhs.max_idle_secs;
-  lhs->webstatus_port = rhs.webstatus_port;
+  lhs->grpc_port = rhs.grpc_port;
   lhs->oom_more_eagerly = rhs.oom_more_eagerly;
   lhs->watchfs = rhs.watchfs;
   lhs->allow_configurable_attributes = rhs.allow_configurable_attributes;
@@ -233,12 +233,13 @@
     watchfs = false;
     option_sources["watchfs"] = rcfile;
   } else if ((value = GetUnaryOption(
-      arg, next_arg, "--use_webstatusserver")) != NULL) {
-    if (!blaze_util::safe_strto32(value, &webstatus_port) ||
-        webstatus_port < 0 || webstatus_port > 65535) {
+      arg, next_arg, "--grpc_port")) != NULL) {
+    if (!blaze_util::safe_strto32(value, &grpc_port) ||
+        grpc_port < -1 || grpc_port > 65535) {
       blaze_util::StringPrintf(error,
-          "Invalid argument to --use_webstatusserver: '%s'. "
-          "Must be a valid port number or 0 if server disabled.\n", value);
+          "Invalid argument to --grpc_port: '%s'. "
+          "Must be a valid port number or -1 to disable the gRPC server.\n",
+          value);
       return blaze_exit_code::BAD_ARGV;
     }
     option_sources["webstatusserver"] = rcfile;