You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by va...@apache.org on 2017/08/01 17:06:12 UTC
spark git commit: [SPARK-21522][CORE] Fix flakiness in
LauncherServerSuite.
Repository: spark
Updated Branches:
refs/heads/master 97ccc63f7 -> b13350180
[SPARK-21522][CORE] Fix flakiness in LauncherServerSuite.
Handle the case where the server closes the socket before the full message
has been written by the client.
Author: Marcelo Vanzin <va...@cloudera.com>
Closes #18727 from vanzin/SPARK-21522.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/b1335018
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/b1335018
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/b1335018
Branch: refs/heads/master
Commit: b133501800b43fa5c538a4e5ad597c9dc7d8378e
Parents: 97ccc63
Author: Marcelo Vanzin <va...@cloudera.com>
Authored: Tue Aug 1 10:06:03 2017 -0700
Committer: Marcelo Vanzin <va...@cloudera.com>
Committed: Tue Aug 1 10:06:03 2017 -0700
----------------------------------------------------------------------
.../org/apache/spark/launcher/LauncherServerSuite.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/b1335018/launcher/src/test/java/org/apache/spark/launcher/LauncherServerSuite.java
----------------------------------------------------------------------
diff --git a/launcher/src/test/java/org/apache/spark/launcher/LauncherServerSuite.java b/launcher/src/test/java/org/apache/spark/launcher/LauncherServerSuite.java
index 03c2934..d0f6abe 100644
--- a/launcher/src/test/java/org/apache/spark/launcher/LauncherServerSuite.java
+++ b/launcher/src/test/java/org/apache/spark/launcher/LauncherServerSuite.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.io.ObjectInputStream;
import java.net.InetAddress;
import java.net.Socket;
+import java.net.SocketException;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.BlockingQueue;
@@ -171,7 +172,15 @@ public class LauncherServerSuite extends BaseSuite {
LauncherServer.getServerInstance().getPort());
client = new TestClient(s);
- client.send(new EvilPayload());
+
+ try {
+ client.send(new EvilPayload());
+ } catch (SocketException se) {
+ // SPARK-21522: this can happen if the server closes the socket before the full message has
+ // been written, so it's expected. It may cause false positives though (socket errors
+ // happening for other reasons).
+ }
+
waitForError(client, handle.getSecret());
assertEquals(0, EvilPayload.EVIL_BIT);
} finally {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org