Update tests to check status update performance as well

HubSpot · Jan 26, 2018 · e4f37f5 · e4f37f5
1 parent e1a7909
commit e4f37f5
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 10 deletions.
diff --git a/...vice/src/main/java/com/hubspot/singularity/mesos/SingularityMesosStatusUpdateHandler.java b/...vice/src/main/java/com/hubspot/singularity/mesos/SingularityMesosStatusUpdateHandler.java
@@ -254,8 +254,6 @@ private void unsafeProcessStatusUpdate(Protos.TaskStatus status) {
       scheduler.handleCompletedTask(task, taskIdObj, isActiveTask, timestamp, taskState, taskHistoryUpdateCreateResult, status);
     }
 
-    System.out.println(newTaskStatusHolder);
-
     saveNewTaskStatusHolder(taskIdObj, newTaskStatusHolder, taskState);
   }
 

diff --git a/SingularityService/src/test/java/com/hubspot/singularity/data/ValidatorTest.java b/SingularityService/src/test/java/com/hubspot/singularity/data/ValidatorTest.java
@@ -313,7 +313,6 @@ public void itForbidsHealthCheckGreaterThanMaxTotalHealthCheck() {
     SingularityRequest request = new SingularityRequestBuilder("1234567", RequestType.SERVICE).build();
 
     WebApplicationException exn = (WebApplicationException) catchThrowable(() -> validator.checkDeploy(request, deploy, Collections.emptyList(), Collections.emptyList()));
-    System.out.println(exn.getResponse().getEntity());
     assertThat((String) exn.getResponse().getEntity())
         .contains("Max healthcheck time");
   }

diff --git a/...rc/test/java/com/hubspot/singularity/scheduler/SingularityOfferPerformanceTestRunner.java b/...rc/test/java/com/hubspot/singularity/scheduler/SingularityOfferPerformanceTestRunner.java
@@ -4,8 +4,11 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.mesos.v1.Protos.Offer;
+import org.apache.mesos.v1.Protos.TaskState;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -14,6 +17,7 @@
 import com.hubspot.singularity.RequestType;
 import com.hubspot.singularity.SingularityRequest;
 import com.hubspot.singularity.SingularityRequestBuilder;
+import com.hubspot.singularity.SingularityTaskId;
 import com.hubspot.singularity.SlavePlacement;
 
 public class SingularityOfferPerformanceTestRunner extends SingularitySchedulerTestBase {
@@ -22,13 +26,13 @@ public SingularityOfferPerformanceTestRunner() {
     super(false);
   }
 
-  @Test(timeout = 300000L)
+  @Test(timeout = 600000L)
   @Ignore
-  public void testOfferCache() {
+  public void testSchedulerPerformance() {
     long start = System.currentTimeMillis();
 
-    int numRequests = 1000;
+    int numRequests = 2000;
-    int numOffers = 500;
+    int numOffers = 1000;
 
     Random r = new Random();
     Iterator<Double> cpuIterator = r.doubles(1, 5).iterator();
@@ -62,6 +66,36 @@ public void testOfferCache() {
     int activeTasks = taskManager.getActiveTaskIds().size();
 
     System.out.println(String.format("Launched %s tasks on %s offers in %s", activeTasks, numOffers, JavaUtils.durationFromMillis(duration)));
+
+    start = System.currentTimeMillis();
+
+    CompletableFuture<Void>[] updateFutures = new CompletableFuture[taskManager.getActiveTaskIds().size()*5];
+    AtomicInteger i = new AtomicInteger(0);
+    for (SingularityTaskId taskId : taskManager.getActiveTaskIds()) {
+      updateFutures[i.getAndIncrement()] = CompletableFuture.supplyAsync(() -> {
+        statusUpdate(taskManager.getTask(taskId).get(), TaskState.TASK_STAGING);
+        return null;
+      });
+      updateFutures[i.getAndIncrement()] = CompletableFuture.supplyAsync(() -> {
+        statusUpdate(taskManager.getTask(taskId).get(), TaskState.TASK_STARTING);
+        return null;
+      });
+      updateFutures[i.getAndIncrement()] = CompletableFuture.supplyAsync(() -> {
+        statusUpdate(taskManager.getTask(taskId).get(), TaskState.TASK_RUNNING);
+        return null;
+      });
+      updateFutures[i.getAndIncrement()] = CompletableFuture.supplyAsync(() -> {
+        statusUpdate(taskManager.getTask(taskId).get(), TaskState.TASK_FAILED);
+        return null;
+      });
+      updateFutures[i.getAndIncrement()] = CompletableFuture.supplyAsync(() -> {
+        statusUpdate(taskManager.getTask(taskId).get(), TaskState.TASK_FAILED);
+        return null;
+      });
+    }
+    CompletableFuture.allOf(updateFutures).join();
+
+    System.out.println(String.format("Ran %s status updates in %s", activeTasks * 5, JavaUtils.durationFromMillis(System.currentTimeMillis() - start)));
   }
 
 

diff --git a/...rityService/src/test/java/com/hubspot/singularity/scheduler/SingularitySchedulerTest.java b/...rityService/src/test/java/com/hubspot/singularity/scheduler/SingularitySchedulerTest.java
@@ -1527,7 +1527,6 @@ public void testTaskOddities() {
     statusUpdate(taskOne, TaskState.TASK_FAILED);
 
     Assert.assertTrue(!taskManager.isActiveTask(taskOne.getTaskId().getId()));
-    System.out.println(taskManager.getTaskHistoryUpdates(taskOne.getTaskId()));
 
     Assert.assertEquals(2, taskManager.getTaskHistoryUpdates(taskOne.getTaskId()).size());
   }
@@ -1703,8 +1702,6 @@ public void testScaleDownTakesHighestInstancesWithPendingTask() {
 
     scheduler.drainPendingQueue();
 
-    System.out.println(taskManager.getPendingTaskIds());
-
     requestResource.scale(requestId, new SingularityScaleRequest(Optional.of(3), Optional.absent(), Optional.absent(),
         Optional.absent(), Optional.absent(), Optional.absent(), Optional.absent(), Optional.absent()), singularityUser);
     scheduler.drainPendingQueue();