diff options
| author | Devaraj K <devaraj@apache.org> | 2015-07-01 22:59:04 -0700 |
|---|---|---|
| committer | Andrew Or <andrew@databricks.com> | 2015-07-01 22:59:04 -0700 |
| commit | 792fcd802c99a0aef2b67d54f0e6e58710e65956 (patch) | |
| tree | 60288189fe52d105dd12a043de316278aea67d8c /yarn | |
| parent | b285ac5ba85fe0b32b00726ad7d3a2efb602e885 (diff) | |
| download | spark-792fcd802c99a0aef2b67d54f0e6e58710e65956.tar.gz spark-792fcd802c99a0aef2b67d54f0e6e58710e65956.tar.bz2 spark-792fcd802c99a0aef2b67d54f0e6e58710e65956.zip | |
[SPARK-8754] [YARN] YarnClientSchedulerBackend doesn't stop gracefully in failure conditions
In YarnClientSchedulerBackend.stop(), added a check for monitorThread.
Author: Devaraj K <devaraj@apache.org>
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
Diffstat (limited to 'yarn')
| -rw-r--r-- | yarn/src/main/scala/org/apache/spark/scheduler/cluster/YarnClientSchedulerBackend.scala | 4 |
1 files changed, 3 insertions, 1 deletions
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 1c8d7ec576..dd8c4fdb54 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") |