vector 0.0.1 → 0.0.2

data/README.md

@@ -115,6 +115,12 @@ renewals - the group will not be scaled down.
 one, or else it's possible Vector may never find eligible nodes for
 scaledown and never scaledown.)
 
+### Integration with Predictive Scaling
+
+Before scaling down, and if Predictive Scaling is in effect, Vector will
+check to see if the size **after** scaling down would trigger Predictive
+Scaling. If it would, the scaling policy will not be executed.
+
 ## Requirements
 
  * Auto Scaling groups must have the GroupInServiceInstances metric

data/lib/vector/cli.rb

@@ -28,29 +28,40 @@ module Vector
                  end
                end
 
+      ps = nil
       if @config[:predictive_scaling][:enabled]
         psconf = @config[:predictive_scaling]
-
         ps = Vector::Function::PredictiveScaling.new(
           { :cloudwatch => cloudwatch }.merge(psconf))
-
-        groups.each do |group|
-          begin
-            ps.run_for(group)
-          rescue => e
-            puts "error performing Predictive Scaling on #{group.name}: #{e.inspect}\n#{e.backtrace.join "\n"}"
-          end
-        end
       end
 
+      fds = nil
       if @config[:flexible_down_scaling][:enabled]
         fdsconf = @config[:flexible_down_scaling]
-
         fds = Vector::Function::FlexibleDownScaling.new(
           { :cloudwatch => cloudwatch }.merge(fdsconf))
+      end
+
+      groups.each do |group|
+        begin
+          ps_check_procs = nil
+
+          if ps
+            ps_result = ps.run_for(group)
+            ps_check_procs = ps_result[:check_procs]
+
+            if ps_result[:triggered]
+              # Don't need to evaluate for scaledown if we triggered a scaleup
+              next
+            end
+          end
+
+          if fds
+            fds.run_for(group, ps_check_procs)
+          end
 
-        groups.each do |group|
-          fds.run_for(group)
+        rescue => e
+          puts "error for #{group.name}: #{e.inspect}\n#{e.backtrace.join "\n"}"
         end
       end
     end

data/lib/vector/functions/flexible_down_scaling.rb

@@ -12,19 +12,21 @@ module Vector
         @max_sunk_cost = options[:max_sunk_cost]
       end
 
-      def run_for(group)
+      def run_for(group, ps_check_procs)
+        result = { :triggered => false }
+
         hlog_ctx("group: #{group.name}") do
           # don't check if no config was specified
           if @up_down_cooldown.nil? && @down_down_cooldown.nil?
             hlog("No cooldown periods specified, exiting")
-            return nil
+            return result
           end
 
           # don't bother checking for a scaledown if desired capacity is
           # already at the minimum size...
           if group.desired_capacity == group.min_size
             hlog("Group is already at minimum size, exiting")
-            return nil
+            return result
           end
 
           scaledown_policies = group.scaling_policies.select do |policy|
@@ -33,6 +35,14 @@ module Vector
 
           scaledown_policies.each do |policy|
             hlog_ctx("policy: #{policy.name}") do
+              # TODO: support adjustment types other than ChangeInCapacity here
+              if policy.adjustment_type == "ChangeInCapacity" &&
+                 ps_check_procs.any? {|ps_check_proc|
+                   ps_check_proc.call(group.desired_capacity + policy.scaling_adjustment) }
+                hlog("Predictive scaleup would trigger a scaleup if group were shrunk")
+                next
+              end
+
               alarms = policy.alarms.keys.map do |alarm_name|
                 @cloudwatch.alarms[alarm_name]
               end
@@ -61,11 +71,15 @@ module Vector
               hlog("Executing policy")
               policy.execute(:honor_cooldown => true)
 
+              result[:triggered] = true
+
               # no need to evaluate other scaledown policies
-              return
+              return result
             end
           end
         end
+
+        result
       end
 
       protected

data/lib/vector/functions/predictive_scaling.rb

@@ -12,8 +12,10 @@ module Vector
       end
 
       def run_for(group)
+        result = { :check_procs => [], :triggered => false }
+
         hlog_ctx "group: #{group.name}" do
-          return if @lookback_windows.length == 0
+          return result if @lookback_windows.length == 0
 
           scaleup_policies = group.scaling_policies.select do |policy|
             policy.scaling_adjustment > 0
@@ -70,15 +72,22 @@ module Vector
 
                       # now take the past total load and divide it by the
                       # current number of instances to get the predicted value
-                      predicted_value = past_load.to_f / now_num
-                      hlog "Predicted #{alarm.metric.name}: #{predicted_value}"
+                      check_proc = Proc.new do |num_nodes|
+                        predicted_value = past_load.to_f / num_nodes
+                        hlog "Predicted #{alarm.metric.name}: #{predicted_value} (#{num_nodes} nodes)"
+
+                        check_alarm_threshold(alarm, predicted_value)
+                      end
+                      result[:check_procs] << check_proc
 
-                      if check_alarm_threshold(alarm, predicted_value)
+                      if check_proc.call(now_num)
                         hlog "Executing policy"
                         policy.execute(honor_cooldown: true)
 
+                        result[:triggered] = true
+
                         # don't need to evaluate further windows or policies on this group
-                        return
+                        return result
                       end
                     end
                   end
@@ -87,6 +96,8 @@ module Vector
             end
           end
         end
+
+        result
       end
 
       protected

data/lib/vector/version.rb

@@ -1,3 +1,3 @@
 module Vector
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vector
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-09 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk