aboutsummaryrefslogtreecommitdiff
path: root/yarn
diff options
context:
space:
mode:
authorReynold Xin <rxin@databricks.com>2016-04-22 09:36:59 -0700
committerReynold Xin <rxin@databricks.com>2016-04-22 09:36:59 -0700
commitc089c6f4e83d85e622b8d13f466a656c2852702b (patch)
tree0759f0137ad230e158699393d183e7fe244e0d6d /yarn
parent056883e070bd258d193fd4d783ab608a19b86c36 (diff)
downloadspark-c089c6f4e83d85e622b8d13f466a656c2852702b.tar.gz
spark-c089c6f4e83d85e622b8d13f466a656c2852702b.tar.bz2
spark-c089c6f4e83d85e622b8d13f466a656c2852702b.zip
[SPARK-10001] Consolidate Signaling and SignalLogger.
## What changes were proposed in this pull request? This is a follow-up to #12557, with the following changes: 1. Fixes some of the style issues. 2. Merges Signaling and SignalLogger into a new class called SignalUtils. It was pretty confusing to have Signaling and Signal in one file, and it was also confusing to have two classes named Signaling and one called the other. 3. Made logging registration idempotent. ## How was this patch tested? N/A. Author: Reynold Xin <rxin@databricks.com> Closes #12605 from rxin/SPARK-10001.
Diffstat (limited to 'yarn')
-rw-r--r--yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala b/yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
index 5bb63500c8..4df90d7b6b 100644
--- a/yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
+++ b/yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
@@ -716,7 +716,7 @@ object ApplicationMaster extends Logging {
private var master: ApplicationMaster = _
def main(args: Array[String]): Unit = {
- SignalLogger.register(log)
+ SignalUtils.registerLogger(log)
val amArgs = new ApplicationMasterArguments(args)
SparkHadoopUtil.get.runAsSparkUser { () =>
master = new ApplicationMaster(amArgs, new YarnRMClient)