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 2018/03/30 17:25:39 UTC
spark git commit: Revert "[SPARK-23785][LAUNCHER] LauncherBackend
doesn't check state of connection before setting state"
Repository: spark
Updated Branches:
refs/heads/branch-2.3 1365d739d -> 3f5955aa0
Revert "[SPARK-23785][LAUNCHER] LauncherBackend doesn't check state of connection before setting state"
This reverts commit 0bfbcaf6696570b74923047266b00ba4dc2ba97c.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/3f5955aa
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/3f5955aa
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/3f5955aa
Branch: refs/heads/branch-2.3
Commit: 3f5955aa0a16707a31fa9089d4babd64b5eed6ff
Parents: 1365d73
Author: Marcelo Vanzin <va...@cloudera.com>
Authored: Fri Mar 30 10:25:17 2018 -0700
Committer: Marcelo Vanzin <va...@cloudera.com>
Committed: Fri Mar 30 10:25:17 2018 -0700
----------------------------------------------------------------------
.../apache/spark/launcher/LauncherBackend.scala | 6 +++---
.../spark/launcher/LauncherServerSuite.java | 20 --------------------
2 files changed, 3 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/3f5955aa/core/src/main/scala/org/apache/spark/launcher/LauncherBackend.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/launcher/LauncherBackend.scala b/core/src/main/scala/org/apache/spark/launcher/LauncherBackend.scala
index 1b049b7..aaae33c 100644
--- a/core/src/main/scala/org/apache/spark/launcher/LauncherBackend.scala
+++ b/core/src/main/scala/org/apache/spark/launcher/LauncherBackend.scala
@@ -67,13 +67,13 @@ private[spark] abstract class LauncherBackend {
}
def setAppId(appId: String): Unit = {
- if (connection != null && isConnected) {
+ if (connection != null) {
connection.send(new SetAppId(appId))
}
}
def setState(state: SparkAppHandle.State): Unit = {
- if (connection != null && isConnected && lastState != state) {
+ if (connection != null && lastState != state) {
connection.send(new SetState(state))
lastState = state
}
@@ -114,10 +114,10 @@ private[spark] abstract class LauncherBackend {
override def close(): Unit = {
try {
- _isConnected = false
super.close()
} finally {
onDisconnected()
+ _isConnected = false
}
}
http://git-wip-us.apache.org/repos/asf/spark/blob/3f5955aa/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 5413d3a..d16337a 100644
--- a/launcher/src/test/java/org/apache/spark/launcher/LauncherServerSuite.java
+++ b/launcher/src/test/java/org/apache/spark/launcher/LauncherServerSuite.java
@@ -185,26 +185,6 @@ public class LauncherServerSuite extends BaseSuite {
}
}
- @Test
- public void testAppHandleDisconnect() throws Exception {
- LauncherServer server = LauncherServer.getOrCreateServer();
- ChildProcAppHandle handle = new ChildProcAppHandle(server);
- String secret = server.registerHandle(handle);
-
- TestClient client = null;
- try {
- Socket s = new Socket(InetAddress.getLoopbackAddress(), server.getPort());
- client = new TestClient(s);
- client.send(new Hello(secret, "1.4.0"));
- handle.disconnect();
- waitForError(client, secret);
- } finally {
- handle.kill();
- close(client);
- client.clientThread.join();
- }
- }
-
private void close(Closeable c) {
if (c != null) {
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org