aboutsummaryrefslogtreecommitdiff
path: root/network
diff options
context:
space:
mode:
authorAaron Davidson <aaron@databricks.com>2014-11-06 17:20:46 -0800
committerAndrew Or <andrew@databricks.com>2014-11-06 17:20:46 -0800
commit6e9ef10fd7446a11f37446c961916ba2a8e02cb8 (patch)
tree2cd4ae312b2266bcd0b0525d7757b33726a50da2 /network
parent96136f222abd4f3abd10cb78a4ebecdb21f3bde7 (diff)
downloadspark-6e9ef10fd7446a11f37446c961916ba2a8e02cb8.tar.gz
spark-6e9ef10fd7446a11f37446c961916ba2a8e02cb8.tar.bz2
spark-6e9ef10fd7446a11f37446c961916ba2a8e02cb8.zip
[SPARK-4277] Support external shuffle service on Standalone Worker
Author: Aaron Davidson <aaron@databricks.com> Closes #3142 from aarondav/worker and squashes the following commits: 3780bd7 [Aaron Davidson] Address comments 2dcdfc1 [Aaron Davidson] Add private[worker] 47f49d3 [Aaron Davidson] NettyBlockTransferService shouldn't care about app ids (it's only b/t executors) 258417c [Aaron Davidson] [SPARK-4277] Support external shuffle service on executor
Diffstat (limited to 'network')
-rw-r--r--network/shuffle/src/main/java/org/apache/spark/network/sasl/SaslMessage.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/network/shuffle/src/main/java/org/apache/spark/network/sasl/SaslMessage.java b/network/shuffle/src/main/java/org/apache/spark/network/sasl/SaslMessage.java
index 5b77e18c26..599cc6428c 100644
--- a/network/shuffle/src/main/java/org/apache/spark/network/sasl/SaslMessage.java
+++ b/network/shuffle/src/main/java/org/apache/spark/network/sasl/SaslMessage.java
@@ -58,7 +58,8 @@ class SaslMessage implements Encodable {
public static SaslMessage decode(ByteBuf buf) {
if (buf.readByte() != TAG_BYTE) {
- throw new IllegalStateException("Expected SaslMessage, received something else");
+ throw new IllegalStateException("Expected SaslMessage, received something else"
+ + " (maybe your client does not have SASL enabled?)");
}
int idLength = buf.readInt();