diff options
author | Reynold Xin <rxin@databricks.com> | 2014-12-09 19:29:09 -0800 |
---|---|---|
committer | Aaron Davidson <aaron@databricks.com> | 2014-12-09 19:29:09 -0800 |
commit | 9bd9334f588dbb44d01554f9f4ca68a153a48993 (patch) | |
tree | 11d69012599e04c5c0bcdb139f3873796d41bfb9 /network/shuffle | |
parent | 2b9b72682e587909a84d3ace214c22cec830eeaf (diff) | |
download | spark-9bd9334f588dbb44d01554f9f4ca68a153a48993.tar.gz spark-9bd9334f588dbb44d01554f9f4ca68a153a48993.tar.bz2 spark-9bd9334f588dbb44d01554f9f4ca68a153a48993.zip |
Config updates for the new shuffle transport.
Author: Reynold Xin <rxin@databricks.com>
Closes #3657 from rxin/conf-update and squashes the following commits:
7370eab [Reynold Xin] Config updates for the new shuffle transport.
Diffstat (limited to 'network/shuffle')
-rw-r--r-- | network/shuffle/src/main/java/org/apache/spark/network/sasl/SaslClientBootstrap.java | 2 | ||||
-rw-r--r-- | network/shuffle/src/main/java/org/apache/spark/network/shuffle/RetryingBlockFetcher.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/network/shuffle/src/main/java/org/apache/spark/network/sasl/SaslClientBootstrap.java b/network/shuffle/src/main/java/org/apache/spark/network/sasl/SaslClientBootstrap.java index 7bc91e3753..33aa134434 100644 --- a/network/shuffle/src/main/java/org/apache/spark/network/sasl/SaslClientBootstrap.java +++ b/network/shuffle/src/main/java/org/apache/spark/network/sasl/SaslClientBootstrap.java @@ -59,7 +59,7 @@ public class SaslClientBootstrap implements TransportClientBootstrap { ByteBuf buf = Unpooled.buffer(msg.encodedLength()); msg.encode(buf); - byte[] response = client.sendRpcSync(buf.array(), conf.saslRTTimeout()); + byte[] response = client.sendRpcSync(buf.array(), conf.saslRTTimeoutMs()); payload = saslClient.response(response); } } finally { diff --git a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/RetryingBlockFetcher.java b/network/shuffle/src/main/java/org/apache/spark/network/shuffle/RetryingBlockFetcher.java index f8a1a26686..4bb0498e5d 100644 --- a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/RetryingBlockFetcher.java +++ b/network/shuffle/src/main/java/org/apache/spark/network/shuffle/RetryingBlockFetcher.java @@ -106,7 +106,7 @@ public class RetryingBlockFetcher { this.fetchStarter = fetchStarter; this.listener = listener; this.maxRetries = conf.maxIORetries(); - this.retryWaitTime = conf.ioRetryWaitTime(); + this.retryWaitTime = conf.ioRetryWaitTimeMs(); this.outstandingBlocksIds = Sets.newLinkedHashSet(); Collections.addAll(outstandingBlocksIds, blockIds); this.currentListener = new RetryingBlockFetchListener(); |