diff options
author | Aaron Davidson <aaron@databricks.com> | 2014-11-06 17:20:46 -0800 |
---|---|---|
committer | Andrew Or <andrew@databricks.com> | 2014-11-06 17:20:57 -0800 |
commit | cbe9a6c8a822beaea5a79e4155759c39d078ea2c (patch) | |
tree | 2cd4ae312b2266bcd0b0525d7757b33726a50da2 /network | |
parent | 6508953a4b8622312c1f0ae4b4b4275b5a2c2bd6 (diff) | |
download | spark-cbe9a6c8a822beaea5a79e4155759c39d078ea2c.tar.gz spark-cbe9a6c8a822beaea5a79e4155759c39d078ea2c.tar.bz2 spark-cbe9a6c8a822beaea5a79e4155759c39d078ea2c.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
(cherry picked from commit 6e9ef10fd7446a11f37446c961916ba2a8e02cb8)
Signed-off-by: Andrew Or <andrew@databricks.com>
Diffstat (limited to 'network')
-rw-r--r-- | network/shuffle/src/main/java/org/apache/spark/network/sasl/SaslMessage.java | 3 |
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(); |