dynamo-autoscale 0.1.2 → 0.1.3

data/CHANGELOG

@@ -1,3 +1,8 @@
+v0.1.3
+
+- Minor logging tweaks.
+- Fixed an undefined method error that stopped Dynamo from scaling.
+
 v0.1.2
 
 - Fixed a require error that caused the program to bomb out in certain

data/lib/dynamo-autoscale/cw_poller.rb

@@ -12,7 +12,7 @@ module DynamoAutoscale
         # polling always happens on interval boundaries regardless of how long
         # polling takes.
         sleep_duration = INTERVAL - ((Time.now.to_i + INTERVAL) % INTERVAL)
-        logger.debug "Sleeping for #{sleep_duration} seconds..."
+        logger.debug "[cw_poller] Sleeping for #{sleep_duration} seconds..."
         sleep(sleep_duration)
 
         do_poll(tables, &block)
@@ -20,7 +20,7 @@ module DynamoAutoscale
     end
 
     def do_poll tables, &block
-      logger.debug "Beginning CloudWatch poll..."
+      logger.debug "[cw_poller] Beginning CloudWatch poll..."
       now = Time.now
 
       tables.each do |table|

data/lib/dynamo-autoscale/dispatcher.rb

@@ -11,14 +11,14 @@ module DynamoAutoscale
       if datum[:provisioned_reads] and (datum[:consumed_reads] > datum[:provisioned_reads])
         lost_reads = datum[:consumed_reads] - datum[:provisioned_reads]
 
-        logger.warn "[reads] Lost units: #{lost_reads} " +
+        logger.warn "[dispatcher][reads] Lost units: #{lost_reads} " +
           "(#{datum[:consumed_reads]} - #{datum[:provisioned_reads]})"
       end
 
       if datum[:provisioned_writes] and (datum[:consumed_writes] > datum[:provisioned_writes])
         lost_writes = datum[:consumed_writes] - datum[:provisioned_writes]
 
-        logger.warn "[writes] Lost units: #{lost_writes} " +
+        logger.warn "[dispatcher][writes] Lost units: #{lost_writes} " +
           "(#{datum[:consumed_writes]} - #{datum[:provisioned_writes]})"
       end
 
@@ -29,7 +29,8 @@ module DynamoAutoscale
         DynamoAutoscale.rules.test(table)
         @last_check[table.name] = time
       else
-        logger.debug "Skipped rule check, already checked for a later data point."
+        logger.debug "[dispatcher] Skipped rule check, already checked for " +
+          "a later data point."
       end
 
       DynamoAutoscale.current_table = nil

data/lib/dynamo-autoscale/dynamo_actioner.rb

@@ -1,5 +1,9 @@
 module DynamoAutoscale
   class DynamoActioner < Actioner
+    def dynamo
+      @dynamo ||= AWS::DynamoDB.new.tables[table.name]
+    end
+
     def scale metric, value
       aws_throughput_key = case metric
       when :reads
@@ -12,22 +16,18 @@ module DynamoAutoscale
     end
 
     def scale_both reads, writes
-      dynamo_scale(table, {
-        read_capacity_units: reads, write_capacity_units: writes
-      })
+      dynamo_scale(read_capacity_units: reads, write_capacity_units: writes)
     end
 
     private
 
-    def self.dynamo_scale opts
-      aws_table = AWS::DynamoDB.new.tables[table.name]
-
-      if aws_table.status == :updating
-        logger.warn "Cannot scale throughputs. Table is updating."
+    def dynamo_scale opts
+      if dynamo.status == :updating
+        logger.warn "[actioner] Cannot scale throughputs. Table is updating."
         return false
       end
 
-      aws_table.provision_throughput(opts)
+      dynamo.provision_throughput(opts)
       return true
     rescue AWS::DynamoDB::Errors::ValidationException => e
       # When you try to set throughput to a negative value or the same value it

data/lib/dynamo-autoscale/local_data_poll.rb

@@ -23,7 +23,7 @@ module DynamoAutoscale
               data = JSON.parse(File.read(table_path)).symbolize_keys
 
               if data[:consumed_writes].nil? or data[:consumed_reads].nil?
-                logger.warn "Lacking data for table #{table_name}. Skipping."
+                logger.warn "[ld_poller] Lacking data for table #{table_name}. Skipping."
                 next
               end
 

data/lib/dynamo-autoscale/rule.rb

@@ -1,5 +1,7 @@
 module DynamoAutoscale
   class Rule
+    include DynamoAutoscale::Logger
+
     attr_accessor :metric, :opts
 
     CONDITIONS = {

data/lib/dynamo-autoscale/table_tracker.rb

@@ -26,7 +26,7 @@ module DynamoAutoscale
     #    :consumed_reads=>342.4033333333333}
     def tick time, datum
       if time < (Time.now.utc - TIME_WINDOW)
-        logger.warn "Attempted to insert data outside of the time window."
+        logger.warn "[table] Attempted to insert data outside of the time window."
         return
       end
 
@@ -36,14 +36,14 @@ module DynamoAutoscale
         datum[:provisioned_writes] = last_provisioned_for :writes, at: time
 
         if datum[:provisioned_writes]
-          logger.debug "Filled in gap in provisioned writes."
+          logger.debug "[table] Filled in gap in provisioned writes."
         end
       end
       if datum[:provisioned_reads].nil?
         datum[:provisioned_reads] = last_provisioned_for :reads, at: time
 
         if datum[:provisioned_reads]
-          logger.debug "Filled in gap in provisioned reads."
+          logger.debug "[table] Filled in gap in provisioned reads."
         end
       end
 
@@ -51,7 +51,7 @@ module DynamoAutoscale
 
       # The code below here just makes sure that we're trimming data points that
       # are outside of the time window.
-      logger.debug "Pruning data that may be outside of time window..."
+      logger.debug "[table] Pruning data that may be outside of time window..."
       now = Time.now.utc
       to_delete = @data.each.take_while { |key, _| key < (now - TIME_WINDOW) }
       to_delete.each { |key, _| @data.delete(key) }
@@ -280,7 +280,7 @@ module DynamoAutoscale
       `r --no-save --args #{data_tmp} #{png_tmp} < #{r_script}`
 
       if $? != 0
-        logger.error "Failed to create graph."
+        logger.error "[table] Failed to create graph."
       else
         `open #{png_tmp}` if opts[:open]
       end
@@ -298,7 +298,7 @@ module DynamoAutoscale
       `r --no-save --args #{data_tmp} #{png_tmp} < #{r_script}`
 
       if $? != 0
-        logger.error "Failed to create graph."
+        logger.error "[table] Failed to create graph."
       else
         `open #{png_tmp}`
       end

data/lib/dynamo-autoscale/version.rb

@@ -1,3 +1,3 @@
 module DynamoAutoscale
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamo-autoscale
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors: