Add support of memoryOverhead and coreLimit on both driver and execut…

…or spec
caraml-dev · Nov 1, 2023 · 50b319d · 50b319d
1 parent e0f8fd7
commit 50b319d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/caraml-store-registry/src/main/java/dev/caraml/store/sparkjob/crd/SparkDriverSpec.java b/caraml-store-registry/src/main/java/dev/caraml/store/sparkjob/crd/SparkDriverSpec.java
@@ -14,9 +14,11 @@ public class SparkDriverSpec {
   private List<V1Toleration> tolerations;
   private Integer cores;
   private String coreRequest;
+  private String coreLimit;
   private String mainApplicationFile;
   private String mainClass;
   private String memory;
+  private String memoryOverhead;
   private String javaOptions;
   private Map<String, String> labels;
   private String serviceAccount;

diff --git a/caraml-store-registry/src/main/java/dev/caraml/store/sparkjob/crd/SparkExecutorSpec.java b/caraml-store-registry/src/main/java/dev/caraml/store/sparkjob/crd/SparkExecutorSpec.java
@@ -14,8 +14,10 @@ public class SparkExecutorSpec {
   private List<V1Toleration> tolerations;
   private Integer cores;
   private String coreRequest;
+  private String coreLimit;
   private Integer instances;
   private String memory;
+  private String memoryOverhead;
   private String javaOptions;
   private Map<String, String> labels;
   private Map<String, String> annotations;

diff --git a/caraml-store-registry/src/test/java/dev/caraml/store/sparkjob/JobServiceTest.java b/caraml-store-registry/src/test/java/dev/caraml/store/sparkjob/JobServiceTest.java
@@ -161,8 +161,11 @@ public void shouldCreateStreamingJob() throws IOException, SparkOperatorApiExcep
     SparkExecutorSpec templateExecutorSpec = new SparkExecutorSpec();
     templateDriverSpec.setCores(1);
     templateDriverSpec.setMemory("1g");
+    templateDriverSpec.setMemoryOverhead("250m");
     templateDriverSpec.setLabels(Map.of("team", "${team}"));
     templateExecutorSpec.setCores(2);
+    templateExecutorSpec.setCoreRequest("100m");
+    templateExecutorSpec.setCoreLimit("200m");
     templateExecutorSpec.setMemory("2g");
     templateSparkApplicationSpec.setDriver(templateDriverSpec);
     templateSparkApplicationSpec.setExecutor(templateExecutorSpec);
@@ -205,10 +208,13 @@ public void shouldCreateStreamingJob() throws IOException, SparkOperatorApiExcep
     SparkDriverSpec expectedDriverSpec = new SparkDriverSpec();
     expectedDriverSpec.setCores(2);
     expectedDriverSpec.setMemory("1g");
+    expectedDriverSpec.setMemoryOverhead("250m");
     expectedDriverSpec.setLabels(Map.of("team", "some-team"));
     expectedSparkApplicationSpec.setDriver(expectedDriverSpec);
     SparkExecutorSpec expectedExecutorSpec = new SparkExecutorSpec();
     expectedExecutorSpec.setCores(2);
+    expectedExecutorSpec.setCoreRequest("100m");
+    expectedExecutorSpec.setCoreLimit("200m");
     expectedExecutorSpec.setMemory("3g");
     expectedSparkApplicationSpec.setExecutor(expectedExecutorSpec);
     expectedSparkApplicationSpec.setImage("sparkImage:latest");