Fix adjustment logic

Author: tmitchel2

src/Provisioner.js

@@ -180,7 +180,7 @@ export default class Provisioner extends ProvisionerConfigurableBase {
     let isBelowMin = this.isBelowMin(adjustmentContext);
     let isAboveThreshold = this.isAboveThreshold(adjustmentContext);
     let isBelowThreshold = this.isBelowThreshold(adjustmentContext);
-    let isAdjustmentWanted = (isAboveMax || isAboveMax || isAboveThreshold || isBelowThreshold);
+    let isAdjustmentWanted = (isAboveMax || isBelowMin || isAboveThreshold || isBelowThreshold);
 
     // Determine if an adjustment is allowed under the rate limiting rules
     let isAfterLastDecreaseGracePeriod = this.isAfterLastAdjustmentGracePeriod(
@@ -221,6 +221,12 @@ export default class Provisioner extends ProvisionerConfigurableBase {
       return false;
     }
 
+    if (context.CapacityConfig.Max != null &&
+      context.ProvisionedValue >= context.CapacityConfig.Max) {
+      // Already at maximum allowed ProvisionedValue
+      return false;
+    }
+
     let utilisationPercent = (context.ConsumedValue / context.ProvisionedValue) * 100;
     return utilisationPercent > context.CapacityAdjustmentConfig.When.UtilisationIsAbovePercent;
   }
@@ -232,6 +238,12 @@ export default class Provisioner extends ProvisionerConfigurableBase {
       return false;
     }
 
+    let min = context.CapacityConfig.Min != null ? context.CapacityConfig.Min : 1;
+    if (context.ProvisionedValue <= min) {
+      // Already at minimum allowed ProvisionedValue
+      return false;
+    }
+
     let utilisationPercent = (context.ConsumedValue / context.ProvisionedValue) * 100;
     return utilisationPercent < context.CapacityAdjustmentConfig.When.UtilisationIsBelowPercent;
   }
@@ -243,7 +255,7 @@ export default class Provisioner extends ProvisionerConfigurableBase {
       return false;
     }
 
-    return context.ConsumedValue > context.CapacityConfig.Max;
+    return context.ProvisionedValue > context.CapacityConfig.Max;
   }
 
   isBelowMin(context: AdjustmentContext): boolean {
@@ -253,7 +265,7 @@ export default class Provisioner extends ProvisionerConfigurableBase {
       return false;
     }
 
-    return context.ConsumedValue < context.CapacityConfig.Min;
+    return context.ProvisionedValue < context.CapacityConfig.Min;
   }
 
   isAfterLastAdjustmentGracePeriod(lastAdjustmentDateTime: string, afterLastAdjustmentMinutes?: number): boolean {

src/provisioning/ProvisionerLogging.js

@@ -39,16 +39,15 @@ export default class ConfigLogging {
 
     if (adjustmentData.isAdjustmentWanted) {
       logMessage += ' so an increment is WANTED';
-    }
-
-    if (adjustmentData.isAdjustmentAllowed) {
-      logMessage += ' and is ALLOWED';
-    } else if (!adjustmentData.isAfterLastDecreaseGracePeriod) {
-      logMessage += ' but is DISALLOWED due to \'AfterLastDecrementMinutes\' grace period';
-    } else if (!adjustmentData.isAfterLastIncreaseGracePeriod) {
-      logMessage += ' but is DISALLOWED due to \'AfterLastIncreaseMinutes\' grace period';
-    } else {
-      logMessage += ' but is DISALLOWED';
+      if (adjustmentData.isAdjustmentAllowed) {
+        logMessage += ' and is ALLOWED';
+      } else if (!adjustmentData.isAfterLastDecreaseGracePeriod) {
+        logMessage += ' but is DISALLOWED due to \'AfterLastDecrementMinutes\' grace period';
+      } else if (!adjustmentData.isAfterLastIncreaseGracePeriod) {
+        logMessage += ' but is DISALLOWED due to \'AfterLastIncreaseMinutes\' grace period';
+      } else {
+        logMessage += ' but is DISALLOWED';
+      }
     }
 
     log(logMessage);