Cleaning up (#475)

Co-authored-by: Sundaram Ananthanarayanan <[email protected]>
Netflix · Jul 11, 2023 · d260438 · d260438
1 parent 8053059
commit d260438
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.../src/main/java/io/mantisrx/master/jobcluster/job/FilterableMantisJobMetadataWritable.java b/.../src/main/java/io/mantisrx/master/jobcluster/job/FilterableMantisJobMetadataWritable.java
@@ -21,6 +21,7 @@
 import io.mantisrx.runtime.MantisJobState;
 import io.mantisrx.runtime.WorkerMigrationConfig;
 import io.mantisrx.runtime.parameter.Parameter;
+import io.mantisrx.server.master.domain.Costs;
 import io.mantisrx.server.master.store.MantisJobMetadataWritable;
 import io.mantisrx.shaded.com.fasterxml.jackson.annotation.JsonCreator;
 import io.mantisrx.shaded.com.fasterxml.jackson.annotation.JsonFilter;
@@ -31,6 +32,7 @@
 
 @JsonFilter("jobMetadata")
 public class FilterableMantisJobMetadataWritable extends MantisJobMetadataWritable {
+    private final Costs costs;
 
     @JsonCreator
     @JsonIgnoreProperties(ignoreUnknown = true)
@@ -47,9 +49,10 @@ public FilterableMantisJobMetadataWritable(@JsonProperty("jobId") String jobId,
                                                @JsonProperty("parameters") List<Parameter> parameters,
                                                @JsonProperty("nextWorkerNumberToUse") int nextWorkerNumberToUse,
                                                @JsonProperty("migrationConfig") WorkerMigrationConfig migrationConfig,
-                                               @JsonProperty("labels") List<Label> labels) {
+                                               @JsonProperty("labels") List<Label> labels,
+                                               @JsonProperty("costs") Costs costs1) {
         super(jobId, name, user, submittedAt, startedAt, jarUrl, numStages, sla, state, subscriptionTimeoutSecs,
                 parameters, nextWorkerNumberToUse, migrationConfig, labels);
+        this.costs = costs1;
     }
-
 }
diff --git a/...ontrol-plane-server/src/main/java/io/mantisrx/server/master/domain/DataFormatAdapter.java b/...ontrol-plane-server/src/main/java/io/mantisrx/server/master/domain/DataFormatAdapter.java
@@ -582,7 +582,8 @@ public static FilterableMantisJobMetadataWritable convertMantisJobMetadataToFilt
                 jobMetadata.getNextWorkerNumberToUse(),
                 // TODO need to wire migration config here so it can get persisted
                 null,
-                jobMetadata.getLabels());
+                jobMetadata.getLabels(),
+                jobMetadata.getJobCosts());
     }