From f53ebd45f53ebe2eee1b7263cc2ffc70366eea2b Mon Sep 17 00:00:00 2001 From: Marcelo Vanzin Date: Mon, 24 Jul 2017 13:21:19 -0700 Subject: [PATCH 1/2] [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. --- .../apache/spark/launcher/LauncherServerSuite.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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 03c2934e2692e..4db12a055e731 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.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 void testStreamFiltering() throws Exception { 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 through (socket errors + // happening for other reasons). + } + waitForError(client, handle.getSecret()); assertEquals(0, EvilPayload.EVIL_BIT); } finally { From 1fcbf537b168420e69c13d9f37045e8da6a3377c Mon Sep 17 00:00:00 2001 From: Marcelo Vanzin Date: Mon, 24 Jul 2017 13:32:27 -0700 Subject: [PATCH 2/2] Fix typo. --- .../java/org/apache/spark/launcher/LauncherServerSuite.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4db12a055e731..d0f6abe2fe692 100644 --- a/launcher/src/test/java/org/apache/spark/launcher/LauncherServerSuite.java +++ b/launcher/src/test/java/org/apache/spark/launcher/LauncherServerSuite.java @@ -177,7 +177,7 @@ public void testStreamFiltering() throws Exception { 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 through (socket errors + // been written, so it's expected. It may cause false positives though (socket errors // happening for other reasons). }