commit 5e73b1f6f08a876037b8d97baad9947c4d5a077c
author Ke Wu <ke.wu.cs@icloud.com> Fri May 15 14:45:56 2020 -0700
committer GitHub <noreply@github.com> Fri May 15 14:45:56 2020 -0700
tree 02d80b3b7e7d1d3a5edc74c4f8e3e08bd5df94bc
parent 9f24f1526d8f1c47e6e8fa4d9f68577cc2995f69

SAMZA-2525:Fix race condition in ClientHelper#isActiveApplication (#1361)

API Changes: None
Upgrade Instructions: None
Usage Instructions: None

samza-yarn/src/main/scala/org/apache/samza/job/yarn/ClientHelper.scala

diff --git a/samza-yarn/src/main/scala/org/apache/samza/job/yarn/ClientHelper.scala b/samza-yarn/src/main/scala/org/apache/samza/job/yarn/ClientHelper.scala
index 196ac91..4c3c93e 100644
--- a/samza-yarn/src/main/scala/org/apache/samza/job/yarn/ClientHelper.scala
+++ b/samza-yarn/src/main/scala/org/apache/samza/job/yarn/ClientHelper.scala
@@ -301,8 +301,8 @@
   }
 
   private def isActiveApplication(applicationReport: ApplicationReport): Boolean = {
-    (Running.equals(toAppStatus(applicationReport).get)
-    || New.equals(toAppStatus(applicationReport).get))
+    val status = toAppStatus(applicationReport).get
+    Running.equals(status) || New.equals(status)
   }
 
   def toAppStatus(applicationReport: ApplicationReport): Option[ApplicationStatus] = {