Merge pull request #11 from hynix/master

fetch last app from yarn api
exacaster · Jan 25, 2022 · 7b5ea02 · 7b5ea02
2 parents 933ec93 + f4f60e9
commit 7b5ea02
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/server/src/main/java/com/exacaster/lighter/backend/yarn/YarnBackend.java b/server/src/main/java/com/exacaster/lighter/backend/yarn/YarnBackend.java
@@ -16,6 +16,7 @@
 import java.io.File;
 import java.net.URI;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -103,7 +104,8 @@ private Optional<String> getYarnApplicationId(Application application) {
                         .map(YarnApplicationWrapper::getApp)
                         .filter(Objects::nonNull)
                         .flatMap(Collection::stream)
-                        .findFirst()
+                        .filter(Objects::nonNull)
+                        .max(Comparator.comparing(YarnApplication::getStartedTime))
                         .map(YarnApplication::getId));
     }
 }
diff --git a/server/src/main/java/com/exacaster/lighter/backend/yarn/resources/YarnApplication.java b/server/src/main/java/com/exacaster/lighter/backend/yarn/resources/YarnApplication.java
@@ -12,15 +12,18 @@ public class YarnApplication {
     private final String id;
     private final String trackingUrl;
     private final String finalStatus;
+    private final Long startedTime;
 
     @JsonCreator
     public YarnApplication(
             @Nullable @JsonProperty("id") String id,
             @Nullable @JsonProperty("trackingUrl") String trackingUrl,
-            @Nullable @JsonProperty("finalStatus") String finalStatus) {
+            @Nullable @JsonProperty("finalStatus") String finalStatus,
+            @Nullable @JsonProperty("startedTime") Long startedTime) {
         this.id = id;
         this.trackingUrl = trackingUrl;
         this.finalStatus = finalStatus;
+        this.startedTime = startedTime;
     }
 
     public String getId() {
@@ -35,12 +38,17 @@ public String getFinalStatus() {
         return finalStatus;
     }
 
+    public Long getStartedTime() {
+        return startedTime;
+    }
+
     @Override
     public String toString() {
         return "YarnApplication{" +
                 "id='" + id + '\'' +
                 ", trackingUrl='" + trackingUrl + '\'' +
                 ", finalStatus='" + finalStatus + '\'' +
+                ", startedTime='" + startedTime + '\'' +
                 '}';
     }
 }
diff --git a/server/src/test/groovy/com/exacaster/lighter/backend/yarn/YarnBackendTest.groovy b/server/src/test/groovy/com/exacaster/lighter/backend/yarn/YarnBackendTest.groovy
@@ -82,7 +82,7 @@ class YarnBackendTest extends Specification {
 
     private mockYarnApp(app) {
         def yarnId = "app-sp123"
-        def yarnApp = new YarnApplication(yarnId, "track", "UNDEFINED")
+        def yarnApp = new YarnApplication(yarnId, "track", "UNDEFINED", 123456789012345)
         client.getApps(app.id) >> new YarnApplicationListResponse(new YarnApplicationWrapper([yarnApp]))
         client.getApplication(yarnId) >> new YarnApplicationResponse(yarnApp)
     }