Added constant "SHUTDOWN_HOOK_PRIORITY" to ApplicationMaster

apache · Sep 13, 2014 · ee6f1aa · ee6f1aa
1 parent 54eb68f
commit ee6f1aa
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
@@ -105,9 +105,8 @@ private[spark] class ApplicationMaster(args: ApplicationMasterArguments,
     }
 
     // Use higher priority than FileSystem.
-    val priority = 20
-    assert(priority > FileSystem.SHUTDOWN_HOOK_PRIORITY)
-    ShutdownHookManager.get().addShutdownHook(cleanupHook, 20)
+    assert(ApplicationMaster.SHUTDOWN_HOOK_PRIORITY > FileSystem.SHUTDOWN_HOOK_PRIORITY)
+    ShutdownHookManager.get().addShutdownHook(cleanupHook, ApplicationMaster.SHUTDOWN_HOOK_PRIORITY)
 
     // Call this to force generation of secret so it gets populated into the
     // Hadoop UGI. This has to happen before the startUserClass which does a
@@ -408,6 +407,8 @@ private[spark] class ApplicationMaster(args: ApplicationMasterArguments,
 
 object ApplicationMaster extends Logging {
 
+  private val SHUTDOWN_HOOK_PRIORITY: Int = 30
+
   private var master: ApplicationMaster = _
 
   def main(args: Array[String]) = {