spark git commit: [SPARK-8754] [YARN] YarnClientSchedulerBackend doesn't stop gracefully in failure conditions
Repository: spark
Updated Branches:
refs/heads/master b285ac5ba -> 792fcd802
[SPARK-8754] [YARN] YarnClientSchedulerBackend doesn't stop gracefully in
failure conditions
In YarnClientSchedulerBackend.stop(), added a check for monitorThread.
Author: Devaraj K
Closes #7153 from devaraj-kavali/master and squashes the following commits:
66be9ad [Devaraj K] https://issues.apache.org/jira/browse/SPARK-8754
YarnClientSchedulerBackend doesn't stop gracefully in failure conditions
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/792fcd80
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/792fcd80
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/792fcd80
Branch: refs/heads/master
Commit: 792fcd802c99a0aef2b67d54f0e6e58710e65956
Parents: b285ac5
Author: Devaraj K
Authored: Wed Jul 1 22:59:04 2015 -0700
Committer: Andrew Or
Committed: Wed Jul 1 22:59:04 2015 -0700
--
.../spark/scheduler/cluster/YarnClientSchedulerBackend.scala | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/spark/blob/792fcd80/yarn/src/main/scala/org/apache/spark/scheduler/cluster/YarnClientSchedulerBackend.scala
--
diff --git
a/yarn/src/main/scala/org/apache/spark/scheduler/cluster/YarnClientSchedulerBackend.scala
b/yarn/src/main/scala/org/apache/spark/scheduler/cluster/YarnClientSchedulerBackend.scala
index 1c8d7ec..dd8c4fd 100644
---
a/yarn/src/main/scala/org/apache/spark/scheduler/cluster/YarnClientSchedulerBackend.scala
+++
b/yarn/src/main/scala/org/apache/spark/scheduler/cluster/YarnClientSchedulerBackend.scala
@@ -148,7 +148,9 @@ private[spark] class YarnClientSchedulerBackend(
*/
override def stop() {
assert(client != null, "Attempted to stop this scheduler before starting
it!")
-monitorThread.interrupt()
+if (monitorThread != null) {
+ monitorThread.interrupt()
+}
super.stop()
client.stop()
logInfo("Stopped")
-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
spark git commit: [SPARK-8754] [YARN] YarnClientSchedulerBackend doesn't stop gracefully in failure conditions
Repository: spark
Updated Branches:
refs/heads/branch-1.4 17def3957 -> 5b468cf0c
[SPARK-8754] [YARN] YarnClientSchedulerBackend doesn't stop gracefully in
failure conditions
In YarnClientSchedulerBackend.stop(), added a check for monitorThread.
Author: Devaraj K
Closes #7153 from devaraj-kavali/master and squashes the following commits:
66be9ad [Devaraj K] https://issues.apache.org/jira/browse/SPARK-8754
YarnClientSchedulerBackend doesn't stop gracefully in failure conditions
(cherry picked from commit 792fcd802c99a0aef2b67d54f0e6e58710e65956)
Signed-off-by: Andrew Or
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/5b468cf0
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/5b468cf0
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/5b468cf0
Branch: refs/heads/branch-1.4
Commit: 5b468cf0c21071d212b0cba7a0cede7eeb5d273b
Parents: 17def39
Author: Devaraj K
Authored: Wed Jul 1 22:59:04 2015 -0700
Committer: Andrew Or
Committed: Wed Jul 1 22:59:13 2015 -0700
--
.../spark/scheduler/cluster/YarnClientSchedulerBackend.scala | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/spark/blob/5b468cf0/yarn/src/main/scala/org/apache/spark/scheduler/cluster/YarnClientSchedulerBackend.scala
--
diff --git
a/yarn/src/main/scala/org/apache/spark/scheduler/cluster/YarnClientSchedulerBackend.scala
b/yarn/src/main/scala/org/apache/spark/scheduler/cluster/YarnClientSchedulerBackend.scala
index 99c0532..e7b0af6 100644
---
a/yarn/src/main/scala/org/apache/spark/scheduler/cluster/YarnClientSchedulerBackend.scala
+++
b/yarn/src/main/scala/org/apache/spark/scheduler/cluster/YarnClientSchedulerBackend.scala
@@ -147,7 +147,9 @@ private[spark] class YarnClientSchedulerBackend(
*/
override def stop() {
assert(client != null, "Attempted to stop this scheduler before starting
it!")
-monitorThread.interrupt()
+if (monitorThread != null) {
+ monitorThread.interrupt()
+}
super.stop()
client.stop()
logInfo("Stopped")
-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
