add some logging hacks

src/python/pants/backend/jvm/tasks/jvm_compile/zinc/zinc_compile.py

@@ -214,7 +214,8 @@ def __init__(self, *args, **kwargs):
       # hermetically https://github.com/pantsbuild/pants/issues/6517
       if self.get_options().incremental:
         raise TaskError("Hermetic zinc execution does not currently support incremental compiles. "
-                        "Please use --no-compile-zinc-incremental.")
+                        "Please use --no-{}-incremental."
+                        .format(self.get_options_scope_equivalent_flag_component()))
       try:
         fast_relpath(self.get_options().pants_workdir, get_buildroot())
       except ValueError:
@@ -230,7 +231,9 @@ def __init__(self, *args, **kwargs):
         # TODO: Make this work by capturing the correct Digest and passing them around the
         # right places.
         # See https://github.com/pantsbuild/pants/issues/6432
-        raise TaskError("Hermetic zinc execution currently doesn't work with classpath jars")
+        raise TaskError("Hermetic zinc execution currently doesn't work with classpath jars. "
+                        "Please no --no-{}-use-classpath-jars."
+                        .format(self.get_options_scope_equivalent_flag_component()))
 
   def select(self, target):
     raise NotImplementedError()

src/rust/engine/fs/Cargo.toml

@@ -16,7 +16,7 @@ futures-cpupool = "0.1"
 # TODO: Switch to a release once https://github.com/alexcrichton/futures-timer/pull/11 and https://github.com/alexcrichton/futures-timer/pull/12 merge
 futures-timer = { git = "https://github.com/pantsbuild/futures-timer", rev = "0b747e565309a58537807ab43c674d8951f9e5a0" }
 glob = "0.2.11"
-grpcio = { git = "https://github.com/pantsbuild/grpc-rs.git", rev = "4dfafe9355dc996d7d0702e7386a6fedcd9734c0", default_features = false, features = ["protobuf-codec", "secure"] }
+grpcio = { git = "https://github.com/cosmicexplorer/grpc-rs.git", rev = "76f03206c4da7f02c67ef381ce2007e27865e431", default_features = false, features = ["protobuf-codec", "secure"] }
 hashing = { path = "../hashing" }
 ignore = "0.4.4"
 indexmap = "1.0.2"

src/rust/engine/fs/src/store.rs

@@ -1999,7 +1999,12 @@ mod remote {
                     // TODO: This may be a race condition that deserves respect, but right now it's
                     // not clear it's an error. See #6344 for a case where we override this behavior
                     // by forking gprcio.
-                    grpcio::Error::RpcFinished(None) => Ok(None),
+                    grpcio::Error::RpcFinished(None)
+                      if std::env::var("_ALLOW_RPCFINISHED").unwrap_or("NO".to_string())
+                        == "YES".to_string() =>
+                    {
+                      Ok(None)
+                    }
                     _ => Err(format!(
                       "Error from server in response to CAS read request: {:?}",
                       e

src/rust/engine/process_execution/Cargo.toml

@@ -13,7 +13,7 @@ bytes = "0.4.5"
 digest = "0.8"
 fs = { path = "../fs" }
 futures = "^0.1.16"
-grpcio = { git = "https://github.com/pantsbuild/grpc-rs.git", rev = "4dfafe9355dc996d7d0702e7386a6fedcd9734c0", default_features = false, features = ["protobuf-codec", "secure"] }
+grpcio = { git = "https://github.com/cosmicexplorer/grpc-rs.git", rev = "76f03206c4da7f02c67ef381ce2007e27865e431", default_features = false, features = ["protobuf-codec", "secure"] }
 hashing = { path = "../hashing" }
 log = "0.4"
 protobuf = { version = "2.0.4", features = ["with-bytes"] }

src/rust/engine/process_execution/bazel_protos/Cargo.toml

@@ -8,7 +8,7 @@ publish = false
 [dependencies]
 bytes = "0.4.5"
 futures = "^0.1.16"
-grpcio = { git = "https://github.com/pantsbuild/grpc-rs.git", rev = "4dfafe9355dc996d7d0702e7386a6fedcd9734c0", default_features = false, features = ["protobuf-codec", "secure"] }
+grpcio = { git = "https://github.com/cosmicexplorer/grpc-rs.git", rev = "76f03206c4da7f02c67ef381ce2007e27865e431", default_features = false, features = ["protobuf-codec", "secure"] }
 hashing = { path = "../../hashing" }
 prost = "0.4"
 prost-derive = "0.4"

src/rust/engine/process_execution/src/remote.rs

@@ -279,7 +279,7 @@ impl super::CommandRunner for CommandRunner {
               attempts += &format!("\nAttempt {}: {:?}", i, attempt);
             }
             debug!(
-              "Finished remote exceution of {} after {} attempts: Stats: {}",
+              "Finished remote execution of {} after {} attempts: Stats: {}",
               description2,
               resp.execution_attempts.len(),
               attempts

src/rust/engine/testutil/mock/Cargo.toml

@@ -9,7 +9,7 @@ publish = false
 bazel_protos = { path = "../../process_execution/bazel_protos" }
 bytes = "0.4.5"
 futures = "^0.1.16"
-grpcio = { git = "https://github.com/pantsbuild/grpc-rs.git", rev = "4dfafe9355dc996d7d0702e7386a6fedcd9734c0", default_features = false, features = ["protobuf-codec", "secure"] }
+grpcio = { git = "https://github.com/cosmicexplorer/grpc-rs.git", rev = "76f03206c4da7f02c67ef381ce2007e27865e431", default_features = false, features = ["protobuf-codec", "secure"] }
 hashing = { path = "../../hashing" }
 parking_lot = "0.6"
 protobuf = { version = "2.0.4", features = ["with-bytes"] }