upgrade to Baragon 0.1.4 + handle INVALID_REQUEST_NOOP

HubSpot · Feb 24, 2015 · e6f1a08 · e6f1a08
1 parent 8ffbc5d
commit e6f1a08
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/SingularityService/src/main/java/com/hubspot/singularity/scheduler/SingularityCleaner.java b/SingularityService/src/main/java/com/hubspot/singularity/scheduler/SingularityCleaner.java
@@ -383,6 +383,7 @@ private boolean shouldRemoveLbState(SingularityTaskId taskId, SingularityLoadBal
       case UNKNOWN:
       case WAITING:
       case SUCCESS:
+      case INVALID_REQUEST_NOOP:
         return true;
       default:
         LOG.trace("Task {} had abnormal LB state {}", taskId, loadBalancerUpdate);
@@ -417,6 +418,7 @@ private boolean shouldEnqueueLbRequest(Optional<SingularityLoadBalancerUpdate> m
       case CANCELING:
       case SUCCESS:
       case WAITING:
+      case INVALID_REQUEST_NOOP:
     }
 
     return false;
@@ -459,6 +461,7 @@ private CheckLBState checkLbState(SingularityTaskId taskId) {
 
     switch (lbRemoveUpdate.getLoadBalancerState()) {
       case SUCCESS:
+      case INVALID_REQUEST_NOOP:
         return CheckLBState.DONE;
       case FAILED:
       case CANCELED:

diff --git a/...ityService/src/main/java/com/hubspot/singularity/scheduler/SingularityNewTaskChecker.java b/...ityService/src/main/java/com/hubspot/singularity/scheduler/SingularityNewTaskChecker.java
@@ -300,6 +300,7 @@ private CheckTaskState getTaskState(SingularityTask task) {
   private Optional<CheckTaskState> checkLbState(BaragonRequestState lbState) {
     switch (lbState) {
       case SUCCESS:
+      case INVALID_REQUEST_NOOP:
         return Optional.of(CheckTaskState.HEALTHY);
       case CANCELED:
       case FAILED:

diff --git a/pom.xml b/pom.xml
@@ -58,7 +58,7 @@
     <dep.swagger.version>1.3.12</dep.swagger.version>
     <dep.swagger-plugin.version>2.3.2</dep.swagger-plugin.version>
 
-    <baragon.version>0.1.2</baragon.version>
+    <baragon.version>0.1.4</baragon.version>
     <curator.version>2.4.2</curator.version>
     <dropwizard.version>0.7.1</dropwizard.version>
     <jets3t.version>0.9.0</jets3t.version>