control-service: fix data job deployment cpu conversion (#3109)

Why Currently, we can configure data job CPU only in milicores. What Added an ability to provide cpu resources in either milicores or cores. Also, switched the database CPU unit to cores as it used to be. Testing done: Unit tests Signed-off-by: Miroslav Ivanov miroslavi@vmware.com Signed-off-by: Miroslav Ivanov miroslavi@vmware.com
vmware · Feb 14, 2024 · 459d6fc · 459d6fc
1 parent 6e4e0a0
commit 459d6fc
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 10 deletions.
diff --git a/...ects/control-service/projects/pipelines_control_service/gradle/wrapper/gradle-wrapper.jar b/...ects/control-service/projects/pipelines_control_service/gradle/wrapper/gradle-wrapper.jar
diff --git a/...ntrol-service/projects/pipelines_control_service/gradle/wrapper/gradle-wrapper.properties b/...ntrol-service/projects/pipelines_control_service/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/...src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobDeploymentCrudAsyncIT.java b/...src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobDeploymentCrudAsyncIT.java
@@ -61,8 +61,8 @@ private void checkDeployment() throws Exception {
     Assertions.assertFalse(jobDeployment.getEnabled());
     Assertions.assertEquals(1000, jobDeployment.getResources().getMemoryLimit());
     Assertions.assertEquals(500, jobDeployment.getResources().getMemoryRequest());
-    Assertions.assertEquals(2000, jobDeployment.getResources().getCpuLimit());
-    Assertions.assertEquals(1000, jobDeployment.getResources().getCpuRequest());
+    Assertions.assertEquals(2, jobDeployment.getResources().getCpuLimit());
+    Assertions.assertEquals(1, jobDeployment.getResources().getCpuRequest());
     Assertions.assertNotNull(jobDeployment.getJobVersion());
     Assertions.assertNotNull(jobDeployment.getContacts());
   }

diff --git a/...es_control_service/src/main/java/com/vmware/taurus/service/deploy/JobImageDeployerV2.java b/...es_control_service/src/main/java/com/vmware/taurus/service/deploy/JobImageDeployerV2.java
@@ -457,7 +457,7 @@ private void setDefaultCpuRequestIfNeeded(DataJobDeploymentResources resources)
     try {
       if (resources.getCpuRequestCores() == null) {
         String cpu = defaultConfigurations.dataJobRequests().getCpu();
-        resources.setCpuRequestCores(K8SMemoryConversionUtils.getCpuInFloat(cpu));
+        resources.setCpuRequestCores(K8SMemoryConversionUtils.getCpuInCores(cpu));
       }
     } catch (ParseException e) {
       handleResourcesException(e);
@@ -468,7 +468,7 @@ private void setDefaultCpuLimitIfNeeded(DataJobDeploymentResources resources) {
     try {
       if (resources.getCpuLimitCores() == null) {
         String cpu = defaultConfigurations.dataJobLimits().getCpu();
-        resources.setCpuLimitCores(K8SMemoryConversionUtils.getCpuInFloat(cpu));
+        resources.setCpuLimitCores(K8SMemoryConversionUtils.getCpuInCores(cpu));
       }
     } catch (ParseException e) {
       handleResourcesException(e);

diff --git a/...trol_service/src/main/java/com/vmware/taurus/service/deploy/K8SMemoryConversionUtils.java b/...trol_service/src/main/java/com/vmware/taurus/service/deploy/K8SMemoryConversionUtils.java
@@ -37,7 +37,13 @@ public static int getMemoryInMi(String memory) throws ParseException {
     return getMemoryInMi(memoryAmount, memory);
   }
 
-  public static float getCpuInFloat(String cpu) throws ParseException {
-    return NumberFormat.getInstance().parse(cpu).floatValue();
+  public static float getCpuInCores(String cpu) throws ParseException {
+    float value = NumberFormat.getInstance().parse(cpu).floatValue();
+
+    if (cpu != null && cpu.endsWith("m")) {
+      value = value / 1000;
+    }
+
+    return value;
   }
 }
diff --git a/...vice/src/test/java/com/vmware/taurus/service/deploy/DataJobDefaultConfigurationsTest.java b/...vice/src/test/java/com/vmware/taurus/service/deploy/DataJobDefaultConfigurationsTest.java
@@ -11,6 +11,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
+import java.text.ParseException;
+
 @SpringBootTest(classes = ControlplaneApplication.class)
 public class DataJobDefaultConfigurationsTest {
 
@@ -35,16 +37,16 @@ public void testDefaultMemoryLimit() throws Exception {
   @Test
   public void testDefaultCpuRequest() throws Exception {
     Assertions.assertEquals(
-        1000,
-        K8SMemoryConversionUtils.getCpuInFloat(
+        1,
+        K8SMemoryConversionUtils.getCpuInCores(
             dataJobDefaultConfigurations.dataJobRequests().getCpu()));
   }
 
   @Test
   public void testDefaultCpuLimit() throws Exception {
     Assertions.assertEquals(
-        2000,
-        K8SMemoryConversionUtils.getCpuInFloat(
+        2,
+        K8SMemoryConversionUtils.getCpuInCores(
             dataJobDefaultConfigurations.dataJobLimits().getCpu()));
   }
 
@@ -77,4 +79,14 @@ public void testTbConversion() {
   public void testTiConversion() {
     Assertions.assertEquals(2097152, K8SMemoryConversionUtils.getMemoryInMi(2, "Ti"));
   }
+
+  @Test
+  public void testCpuMilicoresConversion() throws ParseException {
+    Assertions.assertEquals(1, K8SMemoryConversionUtils.getCpuInCores("1000m"));
+  }
+
+  @Test
+  public void testCpuCoresConversion() throws ParseException {
+    Assertions.assertEquals(1, K8SMemoryConversionUtils.getCpuInCores("1"));
+  }
 }