Let transfer method be config until it works fine.

2 files changed, 8 insertions, 2 deletions

diff --git a/configdefinitions/src/vespa/configserver.def b/configdefinitions/src/vespa/configserver.def
index 3c99875f978..dd72095b72e 100644
--- a/configdefinitions/src/vespa/configserver.def
+++ b/configdefinitions/src/vespa/configserver.def
@@ -46,5 +46,6 @@ dockerVespaBaseImage string default=""
 # Athenz config
 loadBalancerAddress string default=""
 
-# File distributions
+# File distribution
 disableFiledistributor bool default=false
+usechunkedtransfer bool default=false
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
index d83d71966c7..15147d522f3 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
@@ -95,6 +95,7 @@ public class RpcServer implements Runnable, ReloadListener, TenantListener {
     private final FileServer fileServer;
     
     private final ThreadPoolExecutor executorService;
+    private final boolean useChunkedFileTransfer;
     private volatile boolean allTenantsLoaded = false;
 
     /**
@@ -120,6 +121,7 @@ public class RpcServer implements Runnable, ReloadListener, TenantListener {
         this.useRequestVersion = config.useVespaVersionInRequest();
         this.hostedVespa = config.hostedVespa();
         this.fileServer = fileServer;
+        this.useChunkedFileTransfer = config.usechunkedtransfer();
         setUpHandlers();
     }
 
@@ -542,6 +544,9 @@ public class RpcServer implements Runnable, ReloadListener, TenantListener {
     @SuppressWarnings("UnusedDeclaration")
     public final void serveFile(Request request) {
         request.detach();
-        fileServer.serveFile(request, new WholeFileReceiver(request.target()));
+        FileServer.Receiver receiver = useChunkedFileTransfer
+                                       ? new ChunkedFileReceiver(request.target())
+                                       : new WholeFileReceiver(request.target());
+        fileServer.serveFile(request, receiver);
     }
 }