Merge pull request #239 from sjones4/issue-44-elb-pending-failures

4.4 : ELB ignore servo instance activity task failures for pending vms
Corymbia · Dec 1, 2020 · 7cf7ed5 · 7cf7ed5
2 parents a1e7457 + b0d6834
commit 7cf7ed5
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/...cing/src/main/java/com/eucalyptus/loadbalancing/workflow/LoadBalancingActivitiesImpl.java b/...cing/src/main/java/com/eucalyptus/loadbalancing/workflow/LoadBalancingActivitiesImpl.java
@@ -3247,12 +3247,13 @@ public void recordInstanceTaskFailure(final String instanceId) throws LoadBalanc
                 LoadBalancerServoInstance.named(instanceId);
         final LoadBalancerServoInstance entity =
                 Entities.uniqueResult(sample);
-        entity.setActivityFailureCount(entity.getActivityFailureCount() + 1);
-        Entities.persist(entity);
-        db.commit();
+        if (entity.getState() != LoadBalancerServoInstance.STATE.Pending) {
+          entity.setActivityFailureCount(entity.getActivityFailureCount() + 1);
+          db.commit();
+        }
       }
     }catch(final Exception ex) {
        LOG.warn(String.format("Failed to mark the VM (%s) as failed", instanceId), ex);
     }
   }
-}
+}