remote/http: properly support read timeout

Also, remove unused SO_TIMEOUT. Fixes #4890

cc @benjaminp

Closes #4895.

PiperOrigin-RevId: 190051030

1 files changed, 10 insertions, 4 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/remote/blobstore/http/HttpBlobStore.java b/src/main/java/com/google/devtools/build/lib/remote/blobstore/http/HttpBlobStore.java
index bb10623913..012931bade 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/blobstore/http/HttpBlobStore.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/blobstore/http/HttpBlobStore.java
@@ -38,6 +38,7 @@ import io.netty.handler.ssl.SslContextBuilder;
 import io.netty.handler.ssl.SslHandler;
 import io.netty.handler.ssl.SslProvider;
 import io.netty.handler.stream.ChunkedWriteHandler;
+import io.netty.handler.timeout.ReadTimeoutHandler;
 import io.netty.util.internal.PlatformDependent;
 import java.io.ByteArrayInputStream;
 import java.io.FileInputStream;
@@ -127,7 +128,6 @@ public final class HttpBlobStore implements SimpleBlobStore {
         new Bootstrap()
             .channel(NioSocketChannel.class)
             .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, timeoutMillis)
-            .option(ChannelOption.SO_TIMEOUT, timeoutMillis)
             .group(eventLoop)
             .remoteAddress(uri.getHost(), uri.getPort());
     downloadChannels =
@@ -135,14 +135,20 @@ public final class HttpBlobStore implements SimpleBlobStore {
             clientBootstrap,
             new ChannelPoolHandler() {
               @Override
-              public void channelReleased(Channel ch) {}
+              public void channelReleased(Channel ch) {
+                ch.pipeline().remove("read-timeout-handler");
+              }
 
               @Override
-              public void channelAcquired(Channel ch) {}
+              public void channelAcquired(Channel ch) {
+                ch.pipeline()
+                    .addFirst("read-timeout-handler", new ReadTimeoutHandler(timeoutMillis));
+              }
 
               @Override
               public void channelCreated(Channel ch) {
                 ChannelPipeline p = ch.pipeline();
+                p.addFirst("read-timeout-handler", new ReadTimeoutHandler(timeoutMillis));
                 if (sslCtx != null) {
                   SSLEngine engine = sslCtx.newEngine(ch.alloc());
                   engine.setUseClientMode(true);
@@ -213,7 +219,7 @@ public final class HttpBlobStore implements SimpleBlobStore {
           }
         };
     DownloadCommand download = new DownloadCommand(uri, casDownload, key, wrappedOut);
-    ;
+
     Channel ch = null;
     try {
       ch = acquireDownloadChannel();