just use message length not bytes

HubSpot · Jun 6, 2016 · 096aa29 · 096aa29
1 parent b32f29e
commit 096aa29
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/...ce/src/main/java/com/hubspot/singularity/config/SingularityTaskMetadataConfiguration.java b/...ce/src/main/java/com/hubspot/singularity/config/SingularityTaskMetadataConfiguration.java
@@ -14,9 +14,9 @@ public class SingularityTaskMetadataConfiguration {
 
   private Optional<String> sendTaskCompletedMailOnceMetadataTypeIsAvailable = Optional.absent();
 
-  private long maxMetadataMessageBytes = 10000;
+  private long maxMetadataMessageLength = 10000;
 
-  private long maxMetadataTitleBytes = 2000;
+  private long maxMetadataTitleLength = 2000;
 
   public long getTaskPersistAfterFinishBufferMillis() {
     return taskPersistAfterFinishBufferMillis;
@@ -50,19 +50,19 @@ public void setSendTaskCompletedMailOnceMetadataTypeIsAvailable(Optional<String>
     this.sendTaskCompletedMailOnceMetadataTypeIsAvailable = sendTaskCompletedMailOnceMetadataTypeIsAvailable;
   }
 
-  public long getMaxMetadataMessageBytes() {
-    return maxMetadataMessageBytes;
+  public long getMaxMetadataMessageLength() {
+    return maxMetadataMessageLength;
   }
 
-  public void setMaxMetadataMessageBytes(long maxMetadataMessageBytes) {
-    this.maxMetadataMessageBytes = maxMetadataMessageBytes;
+  public void setMaxMetadataMessageLength(long maxMetadataMessageLength) {
+    this.maxMetadataMessageLength = maxMetadataMessageLength;
   }
 
-  public long getMaxMetadataTitleBytes() {
-    return maxMetadataTitleBytes;
+  public long getMaxMetadataTitleLength() {
+    return maxMetadataTitleLength;
   }
 
-  public void setMaxMetadataTitleBytes(long maxMetadataTitleBytes) {
-    this.maxMetadataTitleBytes = maxMetadataTitleBytes;
+  public void setMaxMetadataTitleLength(long maxMetadataTitleLength) {
+    this.maxMetadataTitleLength = maxMetadataTitleLength;
   }
 }
diff --git a/SingularityService/src/main/java/com/hubspot/singularity/resources/TaskResource.java b/SingularityService/src/main/java/com/hubspot/singularity/resources/TaskResource.java
@@ -340,11 +340,12 @@ public void postTaskMetadata(@PathParam("taskId") String taskId, final Singulari
 
     authorizationHelper.checkForAuthorizationByTaskId(taskId, user, SingularityAuthorizationScope.WRITE);
 
-    WebExceptions.checkBadRequest(taskMetadataRequest.getTitle().getBytes().length < taskMetadataConfiguration.getMaxMetadataTitleBytes(),
-      "Task metadata title too long, must be less than %s bytes", taskMetadataConfiguration.getMaxMetadataTitleBytes());
+    WebExceptions.checkBadRequest(taskMetadataRequest.getTitle().length() < taskMetadataConfiguration.getMaxMetadataTitleLength(),
+      "Task metadata title too long, must be less than %s bytes", taskMetadataConfiguration.getMaxMetadataTitleLength());
 
-    WebExceptions.checkBadRequest(!taskMetadataRequest.getMessage().isPresent() || taskMetadataRequest.getMessage().get().getBytes().length < taskMetadataConfiguration.getMaxMetadataMessageBytes(),
-      "Task metadata message too long, must be less than %s bytes", taskMetadataConfiguration.getMaxMetadataMessageBytes());
+    int messageLength = taskMetadataRequest.getMessage().isPresent() ? taskMetadataRequest.getMessage().get().length() : 0;
+    WebExceptions.checkBadRequest(!taskMetadataRequest.getMessage().isPresent() || messageLength < taskMetadataConfiguration.getMaxMetadataMessageLength(),
+      "Task metadata message too long, must be less than %s bytes", taskMetadataConfiguration.getMaxMetadataMessageLength());
 
     if (taskMetadataConfiguration.getAllowedMetadataTypes().isPresent()) {
       WebExceptions.checkBadRequest(taskMetadataConfiguration.getAllowedMetadataTypes().get().contains(taskMetadataRequest.getType()), "%s is not one of the allowed metadata types %s",

diff --git a/SingularityService/src/main/java/com/hubspot/singularity/scheduler/SingularityScheduler.java b/SingularityService/src/main/java/com/hubspot/singularity/scheduler/SingularityScheduler.java
@@ -645,7 +645,7 @@ private List<SingularityPendingTask> getScheduledTaskIds(int numMissingInstances
     final List<SingularityPendingTask> newTasks = Lists.newArrayListWithCapacity(numMissingInstances);
 
     int nextInstanceNumber = 1;
-
+t
     for (int i = 0; i < numMissingInstances; i++) {
       while (inuseInstanceNumbers.contains(nextInstanceNumber)) {
         nextInstanceNumber++;